openapi

go.mod

@@ -17,8 +17,10 @@ require (
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/charmbracelet/x/ansi v0.8.0
 	github.com/fsnotify/fsnotify v1.8.0
+	github.com/getkin/kin-openapi v0.127.0
 	github.com/go-logfmt/logfmt v0.6.0
 	github.com/google/uuid v1.6.0
+	github.com/labstack/echo/v4 v4.13.3
 	github.com/lithammer/fuzzysearch v1.1.8
 	github.com/lrstanley/bubblezone v0.0.0-20250315020633-c249a3fe1231
 	github.com/marcozac/go-jsonc v0.1.1
@@ -44,14 +46,32 @@ require (
 require (
 	cloud.google.com/go v0.120.0 // indirect
 	cloud.google.com/go/auth v0.15.0 // indirect
+	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
+	github.com/invopop/yaml v0.3.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 // indirect
+	github.com/perimeterx/marshmallow v1.1.5 // indirect
+	github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.2 // indirect
+	github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	google.golang.org/api v0.228.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
 require (
@@ -145,3 +165,5 @@ require (
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen

go.sum

@@ -125,6 +125,9 @@ github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payR
 github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
 github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
 github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f h1:C5bqEmzEPLsHm9Mv73lSE9e9bKV23aB1vxOsmZrkl3k=
@@ -139,6 +142,9 @@ github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1
 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/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58=
+github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w=
+github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -156,8 +162,12 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/getkin/kin-openapi v0.127.0 h1:Mghqi3Dhryf3F8vR370nN67pAERW+3a95vomb3MAREY=
+github.com/getkin/kin-openapi v0.127.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM=
 github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -165,6 +175,13 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
+github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
@@ -184,7 +201,10 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -193,9 +213,11 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
 github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -213,10 +235,16 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso=
+github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6 h1:IsMZxCuZqKuao2vNdfD82fjjgPLfyHLpR41Z88viRWs=
@@ -230,16 +258,25 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
+github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
+github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
+github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
 github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
 github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
 github.com/lrstanley/bubblezone v0.0.0-20250315020633-c249a3fe1231 h1:9rjt7AfnrXKNSZhp36A3/4QAZAwGGCGD/p8Bse26zms=
 github.com/lrstanley/bubblezone v0.0.0-20250315020633-c249a3fe1231/go.mod h1:S5etECMx+sZnW0Gm100Ma9J1PgVCTgNyFaqGu2b08b4=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/marcozac/go-jsonc v0.1.1 h1:dnZgAYinXsnI73ZemlbQYPOo1uZYD/LSYI7Aw9IbIeM=
 github.com/marcozac/go-jsonc v0.1.1/go.mod h1:BFDFoML/0Y4/XnOpOdomjrDBn1nIG96p7dlVXBDaybI=
 github.com/mark3labs/mcp-go v0.17.0 h1:5Ps6T7qXr7De/2QTqs9h6BKeZ/qdeUeGrgM5lPzi930=
 github.com/mark3labs/mcp-go v0.17.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
@@ -255,6 +292,8 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OH
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -269,10 +308,30 @@ github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdh
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
 github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 h1:ykgG34472DWey7TSjd8vIfNykXgjOgYJZoQbKfEeY/Q=
+github.com/oapi-codegen/oapi-codegen/v2 v2.4.1/go.mod h1:N5+lY1tiTDV3V1BeHtOxeWXHoPVeApvsvjJqegfoaz8=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/openai/openai-go v0.1.0-beta.10 h1:CknhGXe8aXQMRuqg255PFnWzgRY9nEryMxoNIBBM9tU=
 github.com/openai/openai-go v0.1.0-beta.10/go.mod h1:g461MYGXEXBVdV5SaR/5tNzNbSfwTBBefwc+LlDCK0Y=
 github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
 github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
+github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
+github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -299,6 +358,7 @@ github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppK
 github.com/sebdah/goldie/v2 v2.5.3 h1:9ES/mNN+HNUbNWpVAlrzuZ7jE+Nrczbj8uFRjM7624Y=
 github.com/sebdah/goldie/v2 v2.5.3/go.mod h1:oZ9fp0+se1eapSRjfYbsV/0Hqhbuu3bJVvKI/NNtssI=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
@@ -306,6 +366,8 @@ github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah
 github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas=
 github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
+github.com/speakeasy-api/openapi-overlay v0.9.0 h1:Wrz6NO02cNlLzx1fB093lBlYxSI54VRhy1aSutx0PQg=
+github.com/speakeasy-api/openapi-overlay v0.9.0/go.mod h1:f5FloQrHA7MsxYg9djzMD5h6dxrHjVVByWKh7an8TRc=
 github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
 github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
 github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
@@ -321,6 +383,7 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -340,10 +403,19 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
+github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/vmware-labs/yaml-jsonpath v0.3.2 h1:/5QKeCBGdsInyDCyVNLbXyilb61MXGi9NP674f9Hobk=
+github.com/vmware-labs/yaml-jsonpath v0.3.2/go.mod h1:U6whw1z03QyqgWdgXxvVnQ90zN1BWz5V+51Ewf8k+rQ=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
 github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
@@ -375,6 +447,7 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
 gocloud.dev v0.41.0 h1:qBKd9jZkBKEghYbP/uThpomhedK5s2Gy6Lz7h/zYYrM=
 gocloud.dev v0.41.0/go.mod h1:IetpBcWLUwroOOxKr90lhsZ8vWxeSkuszBnW62sbcf0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
@@ -391,16 +464,24 @@ golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
@@ -416,19 +497,30 @@ golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
 golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -451,6 +543,7 @@ golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
 golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
@@ -466,10 +559,15 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 google.golang.org/api v0.228.0 h1:X2DJ/uoWGnY5obVjewbp8icSL5U4FzuCfy9OjbLSnLs=
@@ -503,15 +601,24 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/tui/tui.go

@@ -83,7 +83,7 @@ var keys = keyMap{
 		key.WithKeys("ctrl+t"),
 		key.WithHelp("ctrl+t", "switch theme"),
 	),
-	
+
 	Tools: key.NewBinding(
 		key.WithKeys("f9"),
 		key.WithHelp("f9", "show available tools"),
@@ -144,7 +144,7 @@ type appModel struct {
 
 	showMultiArgumentsDialog bool
 	multiArgumentsDialog     dialog.MultiArgumentsDialogCmp
-	
+
 	showToolsDialog bool
 	toolsDialog     dialog.ToolsDialog
 }
@@ -299,11 +299,11 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case dialog.CloseThemeDialogMsg:
 		a.showThemeDialog = false
 		return a, nil
-		
+
 	case dialog.CloseToolsDialogMsg:
 		a.showToolsDialog = false
 		return a, nil
-		
+
 	case dialog.ShowToolsDialogMsg:
 		a.showToolsDialog = msg.Show
 		return a, nil
@@ -436,7 +436,7 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				a.showThemeDialog = false
 				a.showModelDialog = false
 				a.showFilepicker = false
-				
+
 				// Load sessions and show the dialog
 				sessions, err := a.app.Sessions.List(context.Background())
 				if err != nil {
@@ -457,7 +457,7 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				// Close other dialogs
 				a.showToolsDialog = false
 				a.showModelDialog = false
-				
+
 				// Show commands dialog
 				if len(a.commands) == 0 {
 					status.Warn("No commands available")
@@ -478,7 +478,7 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				a.showToolsDialog = false
 				a.showThemeDialog = false
 				a.showFilepicker = false
-				
+
 				a.showModelDialog = true
 				return a, nil
 			}
@@ -489,17 +489,17 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				a.showToolsDialog = false
 				a.showModelDialog = false
 				a.showFilepicker = false
-				
+
 				a.showThemeDialog = true
 				return a, a.themeDialog.Init()
 			}
 			return a, nil
 		case key.Matches(msg, keys.Tools):
 			// Check if any other dialog is open
-			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions && 
-			   !a.showSessionDialog && !a.showCommandDialog && !a.showThemeDialog && 
-			   !a.showFilepicker && !a.showModelDialog && !a.showInitDialog && 
-			   !a.showMultiArgumentsDialog {
+			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions &&
+				!a.showSessionDialog && !a.showCommandDialog && !a.showThemeDialog &&
+				!a.showFilepicker && !a.showModelDialog && !a.showInitDialog &&
+				!a.showMultiArgumentsDialog {
 				// Toggle tools dialog
 				a.showToolsDialog = !a.showToolsDialog
 				if a.showToolsDialog {
@@ -555,7 +555,7 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				return a, nil
 			}
 			a.showHelp = !a.showHelp
-			
+
 			// Close other dialogs if opening help
 			if a.showHelp {
 				a.showToolsDialog = false
@@ -574,7 +574,6 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			a.showFilepicker = !a.showFilepicker
 			a.filepicker.ToggleFilepicker(a.showFilepicker)
 			a.app.SetFilepickerOpen(a.showFilepicker)
-			
 			// Close other dialogs if opening filepicker
 			if a.showFilepicker {
 				a.showToolsDialog = false
@@ -681,7 +680,7 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return a, tea.Batch(cmds...)
 		}
 	}
-	
+
 	if a.showToolsDialog {
 		d, toolsCmd := a.toolsDialog.Update(msg)
 		a.toolsDialog = d.(dialog.ToolsDialog)
@@ -716,13 +715,13 @@ func getAvailableToolNames(app *app.App) []string {
 		app.History,
 		app.LSPClients,
 	)
-	
+
 	// Extract tool names
 	var toolNames []string
 	for _, tool := range allTools {
 		toolNames = append(toolNames, tool.Info().Name)
 	}
-	
+
 	return toolNames
 }
 
@@ -931,7 +930,7 @@ func (a appModel) View() string {
 			true,
 		)
 	}
-	
+
 	if a.showToolsDialog {
 		overlay := a.toolsDialog.View()
 		row := lipgloss.Height(appView) / 2

js/bun.lock

@@ -9,8 +9,11 @@
         "@flystorage/local-fs": "^1.1.0",
         "@hono/zod-validator": "^0.5.0",
         "ai": "^5.0.0-alpha.2",
+        "clipanion": "^4.0.0-rc.4",
         "hono": "^4.7.10",
-        "zod": "^3.25.0-beta.20250518T002810",
+        "hono-openapi": "^0.4.8",
+        "zod": "^3.24.4",
+        "zod-openapi": "^4.2.4",
       },
       "devDependencies": {
         "@tsconfig/bun": "^1.0.7",
@@ -34,6 +37,8 @@
 
     "@alcalzone/ansi-tokenize": ["@alcalzone/[email protected]", "", { "dependencies": { "ansi-styles": "^6.2.1", "is-fullwidth-code-point": "^4.0.0" } }, "sha512-3yWxPTq3UQ/FY9p1ErPxIyfT64elWaMvM9lIHnaqpyft63tkxodF5aUElYHrdisWve5cETkh1+KBw1yJuW0aRw=="],
 
+    "@apidevtools/json-schema-ref-parser": ["@apidevtools/[email protected]", "", { "dependencies": { "@jsdevtools/ono": "^7.1.3", "@types/json-schema": "^7.0.15", "js-yaml": "^4.1.0" } }, "sha512-60vepv88RwcJtSHrD6MjIL6Ta3SOYbgfnkHb+ppAVK+o9mXprRtulx7VlRl3lN3bbvysAfCS7WMVfhUYemB0IQ=="],
+
     "@flystorage/dynamic-import": ["@flystorage/[email protected]", "", {}, "sha512-CIbIUrBdaPFyKnkVBaqzksvzNtsMSXITR/G/6zlil3MBnPFq2LX+X4Mv5p2XOmv/3OulFs/ff2SNb+5dc2Twtg=="],
 
     "@flystorage/file-storage": ["@flystorage/[email protected]", "", {}, "sha512-25Gd5EsXDmhHrK5orpRuVqebQms1Cm9m5ACMZ0sVDX+Sbl1V0G88CbcWt7mEoWRYLvQ1U072htqg6Sav76ZlVA=="],
@@ -42,6 +47,8 @@
 
     "@hono/zod-validator": ["@hono/[email protected]", "", { "peerDependencies": { "hono": ">=3.9.0", "zod": "^3.19.1" } }, "sha512-ds5bW6DCgAnNHP33E3ieSbaZFd5dkV52ZjyaXtGoR06APFrCtzAsKZxTHwOrJNBdXsi0e5wNwo5L4nVEVnJUdg=="],
 
+    "@jsdevtools/ono": ["@jsdevtools/[email protected]", "", {}, "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="],
+
     "@opentelemetry/api": ["@opentelemetry/[email protected]", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
     "@standard-schema/spec": ["@standard-schema/[email protected]", "", {}, "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA=="],
@@ -54,6 +61,8 @@
 
     "@types/bun": ["@types/[email protected]", "", { "dependencies": { "bun-types": "1.2.13" } }, "sha512-u6vXep/i9VBxoJl3GjZsl/BFIsvML8DfVDO0RYLEwtSZSp981kEO1V5NwRcO1CPJ7AmvpbnDCiMKo3JvbDEjAg=="],
 
+    "@types/json-schema": ["@types/[email protected]", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
+
     "@types/node": ["@types/[email protected]", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg=="],
 
     "@types/prop-types": ["@types/[email protected]", "", {}, "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ=="],
@@ -68,6 +77,8 @@
 
     "ansi-styles": ["[email protected]", "", {}, "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="],
 
+    "argparse": ["[email protected]", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],
+
     "auto-bind": ["[email protected]", "", {}, "sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg=="],
 
     "bun-types": ["[email protected]", "", { "dependencies": { "@types/node": "*" } }, "sha512-rRjA1T6n7wto4gxhAO/ErZEtOXyEZEmnIHQfl0Dt1QQSB4QV0iP6BZ9/YB5fZaHFQ2dwHFrmPaRQ9GGMX01k9Q=="],
@@ -80,6 +91,10 @@
 
     "cli-truncate": ["[email protected]", "", { "dependencies": { "slice-ansi": "^5.0.0", "string-width": "^7.0.0" } }, "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA=="],
 
+    "clipanion": ["[email protected]", "", { "dependencies": { "typanion": "^3.8.0" } }, "sha512-CXkMQxU6s9GklO/1f714dkKBMu1lopS1WFF0B8o4AxPykR1hpozxSiUZ5ZUeBjfPgCWqbcNOtZVFhB8Lkfp1+Q=="],
+
+    "clone": ["[email protected]", "", {}, "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="],
+
     "code-excerpt": ["[email protected]", "", { "dependencies": { "convert-to-spaces": "^2.0.1" } }, "sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA=="],
 
     "convert-to-spaces": ["[email protected]", "", {}, "sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ=="],
@@ -104,6 +119,8 @@
 
     "hono": ["[email protected]", "", {}, "sha512-QkACju9MiN59CKSY5JsGZCYmPZkA6sIW6OFCUp7qDjZu6S6KHtJHhAc9Uy9mV9F8PJ1/HQ3ybZF2yjCa/73fvQ=="],
 
+    "hono-openapi": ["[email protected]", "", { "dependencies": { "json-schema-walker": "^2.0.0" }, "peerDependencies": { "@hono/arktype-validator": "^2.0.0", "@hono/effect-validator": "^1.2.0", "@hono/typebox-validator": "^0.2.0 || ^0.3.0", "@hono/valibot-validator": "^0.5.1", "@hono/zod-validator": "^0.4.1", "@sinclair/typebox": "^0.34.9", "@valibot/to-json-schema": "^1.0.0-beta.3", "arktype": "^2.0.0", "effect": "^3.11.3", "hono": "^4.6.13", "openapi-types": "^12.1.3", "valibot": "^1.0.0-beta.9", "zod": "^3.23.8", "zod-openapi": "^4.0.0" }, "optionalPeers": ["@hono/arktype-validator", "@hono/effect-validator", "@hono/typebox-validator", "@hono/valibot-validator", "@hono/zod-validator", "@sinclair/typebox", "@valibot/to-json-schema", "arktype", "effect", "hono", "valibot", "zod", "zod-openapi"] }, "sha512-LYr5xdtD49M7hEAduV1PftOMzuT8ZNvkyWfh1DThkLsIr4RkvDb12UxgIiFbwrJB6FLtFXLoOZL9x4IeDk2+VA=="],
+
     "ieee754": ["[email protected]", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
 
     "indent-string": ["[email protected]", "", {}, "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg=="],
@@ -118,8 +135,12 @@
 
     "js-tokens": ["[email protected]", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="],
 
+    "js-yaml": ["[email protected]", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="],
+
     "json-schema": ["[email protected]", "", {}, "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="],
 
+    "json-schema-walker": ["[email protected]", "", { "dependencies": { "@apidevtools/json-schema-ref-parser": "^11.1.0", "clone": "^2.1.2" } }, "sha512-nXN2cMky0Iw7Af28w061hmxaPDaML5/bQD9nwm1lOoIKEGjHcRGxqWe4MfrkYThYAPjSUhmsp4bJNoLAyVn9Xw=="],
+
     "loose-envify": ["[email protected]", "", { "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, "bin": { "loose-envify": "cli.js" } }, "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="],
 
     "mime-db": ["[email protected]", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],
@@ -132,6 +153,8 @@
 
     "onetime": ["[email protected]", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="],
 
+    "openapi-types": ["[email protected]", "", {}, "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw=="],
+
     "patch-console": ["[email protected]", "", {}, "sha512-0YNdUceMdaQwoKce1gatDScmMo5pu/tfABfnzEqeG0gtTmd7mh/WcwgUjtAeOU7N8nFFlbQBnFK2gXW5fGvmMA=="],
 
     "peek-readable": ["[email protected]", "", {}, "sha512-nri2TO5JE3/mRryik9LlHFT53cgHfRK0Lt0BAZQXku/AW3E6XLt2GaY8siWi7dvW/m1z0ecn+J+bpDa9ZN3IsQ=="],
@@ -158,6 +181,8 @@
 
     "token-types": ["[email protected]", "", { "dependencies": { "@tokenizer/token": "^0.3.0", "ieee754": "^1.2.1" } }, "sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA=="],
 
+    "typanion": ["[email protected]", "", {}, "sha512-ZW/lVMRabETuYCd9O9ZvMhAh8GslSqaUjxmK/JLPCh6l73CvLBiuXswj/+7LdnWOgYsQ130FqLzFz5aGT4I3Ug=="],
+
     "type-fest": ["[email protected]", "", {}, "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA=="],
 
     "typescript": ["[email protected]", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ=="],
@@ -174,7 +199,9 @@
 
     "yoga-layout": ["[email protected]", "", {}, "sha512-0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ=="],
 
-    "zod": ["[email protected]", "", {}, "sha512-3/aIqMbUXG9EjTelJkDcWd+izJP5MxFgQEMSYI8n41pwYhRDYYxy2dnbkgfNcnLbFZ9uByZn9XXqHTh05QHqSQ=="],
+    "zod": ["[email protected]", "", {}, "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg=="],
+
+    "zod-openapi": ["[email protected]", "", { "peerDependencies": { "zod": "^3.21.4" } }, "sha512-tsrQpbpqFCXqVXUzi3TPwFhuMtLN3oNZobOtYnK6/5VkXsNdnIgyNr4r8no4wmYluaxzN3F7iS+8xCW8BmMQ8g=="],
 
     "zod-to-json-schema": ["[email protected]", "", { "peerDependencies": { "zod": "^3.24.1" } }, "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g=="],
 

js/openapi.json

@@ -0,0 +1,90 @@
+{
+  "openapi": "3.1.0",
+  "info": {
+    "title": "opencode",
+    "description": "opencode api",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/session_create": {
+      "post": {
+        "responses": {
+          "200": {
+            "description": "Successfully created session",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "pattern": "^ses"
+                    },
+                    "title": {
+                      "type": "string"
+                    },
+                    "tokens": {
+                      "type": "object",
+                      "properties": {
+                        "input": {
+                          "type": "number"
+                        },
+                        "output": {
+                          "type": "number"
+                        },
+                        "reasoning": {
+                          "type": "number"
+                        }
+                      },
+                      "required": [
+                        "input",
+                        "output",
+                        "reasoning"
+                      ]
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "title",
+                    "tokens"
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "operationId": "postSession_create",
+        "parameters": [],
+        "description": "Create a new session"
+      }
+    },
+    "/session_chat": {
+      "post": {
+        "responses": {},
+        "operationId": "postSession_chat",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "sessionID": {
+                    "type": "string"
+                  },
+                  "parts": {}
+                },
+                "required": [
+                  "sessionID"
+                ]
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {}
+  }
+}

js/package.json

@@ -19,7 +19,10 @@
     "@flystorage/local-fs": "^1.1.0",
     "@hono/zod-validator": "^0.5.0",
     "ai": "^5.0.0-alpha.2",
+    "clipanion": "^4.0.0-rc.4",
     "hono": "^4.7.10",
-    "zod": "^3.25.0-beta.20250518T002810"
+    "hono-openapi": "^0.4.8",
+    "zod": "^3.24.4",
+    "zod-openapi": "^4.2.4"
   }
 }

js/src/app/config.ts

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { Log } from "../util/log";
-import { z } from "zod/v4";
+import { z } from "zod";
 
 export namespace Config {
   const log = Log.create({ service: "config" });

js/src/bus/index.ts

@@ -1,4 +1,4 @@
-import type { z, ZodSchema } from "zod/v4";
+import type { z, ZodSchema } from "zod";
 import { App } from "../app";
 import { Log } from "../util/log";
 

js/src/id/id.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 import { randomBytes } from "crypto";
 
 export namespace Identifier {

js/src/index.ts

@@ -1,11 +1,34 @@
 import { App } from "./app";
-import process from "node:process";
 import { Server } from "./server/server";
+import { Cli, Command, runExit } from "clipanion";
 
-const app = await App.create({
-  directory: process.cwd(),
+const cli = new Cli({
+  binaryLabel: `opencode`,
+  binaryName: `opencode`,
+  binaryVersion: `1.0.0`,
 });
 
-App.provide(app, async () => {
-  const server = Server.listen();
-});
+cli.register(
+  class Run extends Command {
+    async execute() {
+      const app = await App.create({
+        directory: process.cwd(),
+      });
+
+      await App.provide(app, async () => {
+        const server = Server.listen();
+      });
+    }
+  },
+);
+cli.register(
+  class OpenApi extends Command {
+    static paths = [["openapi"]];
+    async execute() {
+      const specs = await Server.openapi();
+      this.context.stdout.write(JSON.stringify(specs, null, 2));
+    }
+  },
+);
+const [_bun, _app, ...args] = process.argv;
+cli.runExit(args);

js/src/server/server.ts

@@ -1,10 +1,10 @@
 import { Log } from "../util/log";
 import { Bus } from "../bus";
-
+import { describeRoute, generateSpecs, openAPISpecs } from "hono-openapi";
 import { Hono } from "hono";
 import { streamSSE } from "hono/streaming";
 import { Session } from "../session/session";
-import { zValidator } from "@hono/zod-validator";
+import { resolver, validator as zValidator } from "hono-openapi/zod";
 import { z } from "zod";
 
 export namespace Server {
@@ -14,7 +14,21 @@ export namespace Server {
   export type App = ReturnType<typeof app>;
 
   function app() {
-    return new Hono()
+    const app = new Hono();
+
+    const result = app
+      .get(
+        "/openapi",
+        openAPISpecs(app, {
+          documentation: {
+            info: {
+              title: "opencode",
+              version: "1.0.0",
+              description: "opencode api",
+            },
+          },
+        }),
+      )
       .get("/event", async (c) => {
         log.info("event connected");
         return streamSSE(c, async (stream) => {
@@ -32,10 +46,26 @@ export namespace Server {
           });
         });
       })
-      .post("/session_create", async (c) => {
-        const session = await Session.create();
-        return c.json(session);
-      })
+      .post(
+        "/session_create",
+        describeRoute({
+          description: "Create a new session",
+          responses: {
+            200: {
+              description: "Successfully created session",
+              content: {
+                "application/json": {
+                  schema: resolver(Session.Info),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => {
+          const session = await Session.create();
+          return c.json(session);
+        },
+      )
       .post(
         "/session_chat",
         zValidator(
@@ -51,6 +81,22 @@ export namespace Server {
           return c.json(msg);
         },
       );
+
+    return result;
+  }
+
+  export async function openapi() {
+    const a = app();
+    const result = await generateSpecs(a, {
+      documentation: {
+        info: {
+          title: "opencode",
+          version: "1.0.0",
+          description: "opencode api",
+        },
+      },
+    });
+    return result;
   }
 
   export function listen() {

js/src/session/session.ts

@@ -1,5 +1,4 @@
 import path from "path";
-import { z } from "zod/v3";
 import { App } from "../app/";
 import { Identifier } from "../id/id";
 import { LLM } from "../llm/llm";
@@ -8,26 +7,27 @@ import { Log } from "../util/log";
 import {
   convertToModelMessages,
   streamText,
-  tool,
   type TextUIPart,
   type ToolInvocationUIPart,
   type UIDataTypes,
   type UIMessage,
   type UIMessagePart,
 } from "ai";
+import { z } from "zod";
 
 export namespace Session {
   const log = Log.create({ service: "session" });
 
-  export interface Info {
-    id: string;
-    title: string;
-    tokens: {
-      input: number;
-      output: number;
-      reasoning: number;
-    };
-  }
+  export const Info = z.object({
+    id: Identifier.schema("session"),
+    title: z.string(),
+    tokens: z.object({
+      input: z.number(),
+      output: z.number(),
+      reasoning: z.number(),
+    }),
+  });
+  export type Info = z.output<typeof Info>;
 
   export type Message = UIMessage<{ sessionID: string }>;
 

js/src/storage/storage.ts

@@ -5,7 +5,7 @@ import { Log } from "../util/log";
 import { App } from "../app";
 import { AppPath } from "../app/path";
 import { Bus } from "../bus";
-import z from "zod/v4";
+import z from "zod";
 
 export namespace Storage {
   const log = Log.create({ service: "storage" });

pkg/app/app.go

@@ -1,53 +0,0 @@
-package app
-
-import (
-	"context"
-	"log/slog"
-	"os"
-	"path/filepath"
-
-	"github.com/sst/opencode/pkg/app/paths"
-)
-
-type App struct {
-	ctx       context.Context
-	directory string
-	config    *Config
-	storage   *Storage
-}
-
-func New(ctx context.Context, directory string) (*App, error) {
-	var err error
-	app := &App{
-		directory: directory,
-		ctx:       ctx,
-	}
-
-	data := paths.Data(directory)
-	if err := os.MkdirAll(data, 0755); err != nil {
-		return nil, err
-	}
-
-	err = os.MkdirAll(paths.Log(directory), 0755)
-	if err != nil {
-		return nil, err
-	}
-	logFile, err := os.Create(filepath.Join(paths.Log(directory), "opencode.log"))
-	if err != nil {
-		return nil, err
-	}
-	slog.SetDefault(slog.New(slog.NewTextHandler(logFile, &slog.HandlerOptions{})))
-	slog.Info("log created")
-
-	app.config, err = initConfig(directory)
-	if err != nil {
-		return nil, err
-	}
-
-	app.storage, err = initStorage(app)
-	if err != nil {
-		return nil, err
-	}
-
-	return app, nil
-}

pkg/app/config.go

@@ -1,45 +0,0 @@
-package app
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/marcozac/go-jsonc"
-)
-
-type Config struct {
-}
-
-type ConfigMCP struct {
-}
-
-type ConfigProvider struct {
-}
-
-type ErrInvalidConfig struct {
-	source error
-}
-
-func (e ErrInvalidConfig) Error() string {
-	return "ErrInvalidConfig"
-}
-
-func (e ErrInvalidConfig) Unwrap() error {
-	return e.source
-}
-
-func initConfig(directory string) (*Config, error) {
-	configPath := filepath.Join(directory, "opencode.jsonc")
-	_, err := os.Stat(configPath)
-	result := &Config{}
-	if err == nil {
-		data, err := os.ReadFile(configPath)
-		if err == nil {
-			err := jsonc.Unmarshal(data, result)
-			if err != nil {
-				return nil, ErrInvalidConfig{err}
-			}
-		}
-	}
-	return result, nil
-}

pkg/app/paths/paths.go

@@ -1,15 +0,0 @@
-package paths
-
-import "path/filepath"
-
-func Data(project string) string {
-	return filepath.Join(project, ".opencode")
-}
-
-func Storage(project string) string {
-	return filepath.Join(Data(project), "storage")
-}
-
-func Log(project string) string {
-	return filepath.Join(Data(project), "log")
-}

pkg/app/storage.go

@@ -1,42 +0,0 @@
-package app
-
-import (
-	"log/slog"
-	"os"
-	"path/filepath"
-
-	"github.com/sst/opencode/pkg/app/paths"
-	"gocloud.dev/blob"
-	"gocloud.dev/blob/fileblob"
-)
-
-type Storage struct {
-	bucket *blob.Bucket
-	app    *App
-	log    *slog.Logger
-}
-
-func initStorage(app *App) (*Storage, error) {
-	var err error
-	result := &Storage{
-		app: app,
-	}
-	storageDir := paths.Storage(app.directory)
-	if err := os.MkdirAll(storageDir, 0755); err != nil {
-		return nil, err
-	}
-	result.bucket, err = fileblob.OpenBucket(storageDir, &fileblob.Options{
-		NoTempDir: true,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-type StorageWriterOptions = blob.WriterOptions
-
-func (s *Storage) NewWriter(opts *StorageWriterOptions, path ...string) (*blob.Writer, error) {
-	joined := filepath.Join(path...)
-	return s.bucket.NewWriter(s.app.ctx, joined, nil)
-}

pkg/client/client.go

@@ -0,0 +1,3 @@
+package client
+
+//go:generate go tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=./config.yml ../../js/openapi.json

pkg/client/config.yml

@@ -0,0 +1,5 @@
+package: client
+output: generated.go
+generate:
+  - client
+  - types

pkg/client/gen/event.json

@@ -0,0 +1,19 @@
+{
+  "type": "object",
+  "$schema": "https://json-schema.org/draft-2020-12/schema",
+  "definitions": {
+    "event.storage.write": {
+      "type": "object",
+      "properties": {
+        "key": {
+          "type": "string"
+        },
+        "body": {}
+      },
+      "required": [
+        "key",
+        "body"
+      ]
+    }
+  }
+}

pkg/client/gen/openapi.json

@@ -0,0 +1,94 @@
+{
+  "openapi": "3.1.0",
+  "info": {
+    "title": "opencode",
+    "description": "opencode api",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/session_create": {
+      "post": {
+        "responses": {
+          "200": {
+            "description": "Successfully created session",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Session.Info"
+                }
+              }
+            }
+          }
+        },
+        "operationId": "postSession_create",
+        "parameters": [],
+        "description": "Create a new session"
+      }
+    },
+    "/session_chat": {
+      "post": {
+        "responses": {},
+        "operationId": "postSession_chat",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "sessionID": {
+                    "type": "string"
+                  },
+                  "parts": {}
+                },
+                "required": [
+                  "sessionID"
+                ]
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Session.Info": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "pattern": "^ses"
+          },
+          "title": {
+            "type": "string"
+          },
+          "tokens": {
+            "type": "object",
+            "properties": {
+              "input": {
+                "type": "number"
+              },
+              "output": {
+                "type": "number"
+              },
+              "reasoning": {
+                "type": "number"
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "reasoning"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "title",
+          "tokens"
+        ]
+      }
+    }
+  }
+}

pkg/client/generated-client.go

@@ -0,0 +1,383 @@
+// Package client provides primitives to interact with the openapi HTTP API.
+//
+// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT.
+package client
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+)
+
+// SessionInfo defines model for Session.Info.
+type SessionInfo struct {
+	Id     string `json:"id"`
+	Title  string `json:"title"`
+	Tokens struct {
+		Input     float32 `json:"input"`
+		Output    float32 `json:"output"`
+		Reasoning float32 `json:"reasoning"`
+	} `json:"tokens"`
+}
+
+// PostSessionChatJSONBody defines parameters for PostSessionChat.
+type PostSessionChatJSONBody struct {
+	Parts     *interface{} `json:"parts,omitempty"`
+	SessionID string       `json:"sessionID"`
+}
+
+// PostSessionChatJSONRequestBody defines body for PostSessionChat for application/json ContentType.
+type PostSessionChatJSONRequestBody PostSessionChatJSONBody
+
+// RequestEditorFn  is the function signature for the RequestEditor callback function
+type RequestEditorFn func(ctx context.Context, req *http.Request) error
+
+// Doer performs HTTP requests.
+//
+// The standard http.Client implements this interface.
+type HttpRequestDoer interface {
+	Do(req *http.Request) (*http.Response, error)
+}
+
+// Client which conforms to the OpenAPI3 specification for this service.
+type Client struct {
+	// The endpoint of the server conforming to this interface, with scheme,
+	// https://api.deepmap.com for example. This can contain a path relative
+	// to the server, such as https://api.deepmap.com/dev-test, and all the
+	// paths in the swagger spec will be appended to the server.
+	Server string
+
+	// Doer for performing requests, typically a *http.Client with any
+	// customized settings, such as certificate chains.
+	Client HttpRequestDoer
+
+	// A list of callbacks for modifying requests which are generated before sending over
+	// the network.
+	RequestEditors []RequestEditorFn
+}
+
+// ClientOption allows setting custom parameters during construction
+type ClientOption func(*Client) error
+
+// Creates a new Client, with reasonable defaults
+func NewClient(server string, opts ...ClientOption) (*Client, error) {
+	// create a client with sane default values
+	client := Client{
+		Server: server,
+	}
+	// mutate client and add all optional params
+	for _, o := range opts {
+		if err := o(&client); err != nil {
+			return nil, err
+		}
+	}
+	// ensure the server URL always has a trailing slash
+	if !strings.HasSuffix(client.Server, "/") {
+		client.Server += "/"
+	}
+	// create httpClient, if not already present
+	if client.Client == nil {
+		client.Client = &http.Client{}
+	}
+	return &client, nil
+}
+
+// WithHTTPClient allows overriding the default Doer, which is
+// automatically created using http.Client. This is useful for tests.
+func WithHTTPClient(doer HttpRequestDoer) ClientOption {
+	return func(c *Client) error {
+		c.Client = doer
+		return nil
+	}
+}
+
+// WithRequestEditorFn allows setting up a callback function, which will be
+// called right before sending the request. This can be used to mutate the request.
+func WithRequestEditorFn(fn RequestEditorFn) ClientOption {
+	return func(c *Client) error {
+		c.RequestEditors = append(c.RequestEditors, fn)
+		return nil
+	}
+}
+
+// The interface specification for the client above.
+type ClientInterface interface {
+	// PostSessionChatWithBody request with any body
+	PostSessionChatWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error)
+
+	PostSessionChat(ctx context.Context, body PostSessionChatJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error)
+
+	// PostSessionCreate request
+	PostSessionCreate(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error)
+}
+
+func (c *Client) PostSessionChatWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewPostSessionChatRequestWithBody(c.Server, contentType, body)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
+func (c *Client) PostSessionChat(ctx context.Context, body PostSessionChatJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewPostSessionChatRequest(c.Server, body)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
+func (c *Client) PostSessionCreate(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewPostSessionCreateRequest(c.Server)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
+// NewPostSessionChatRequest calls the generic PostSessionChat builder with application/json body
+func NewPostSessionChatRequest(server string, body PostSessionChatJSONRequestBody) (*http.Request, error) {
+	var bodyReader io.Reader
+	buf, err := json.Marshal(body)
+	if err != nil {
+		return nil, err
+	}
+	bodyReader = bytes.NewReader(buf)
+	return NewPostSessionChatRequestWithBody(server, "application/json", bodyReader)
+}
+
+// NewPostSessionChatRequestWithBody generates requests for PostSessionChat with any type of body
+func NewPostSessionChatRequestWithBody(server string, contentType string, body io.Reader) (*http.Request, error) {
+	var err error
+
+	serverURL, err := url.Parse(server)
+	if err != nil {
+		return nil, err
+	}
+
+	operationPath := fmt.Sprintf("/session_chat")
+	if operationPath[0] == '/' {
+		operationPath = "." + operationPath
+	}
+
+	queryURL, err := serverURL.Parse(operationPath)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", queryURL.String(), body)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Add("Content-Type", contentType)
+
+	return req, nil
+}
+
+// NewPostSessionCreateRequest generates requests for PostSessionCreate
+func NewPostSessionCreateRequest(server string) (*http.Request, error) {
+	var err error
+
+	serverURL, err := url.Parse(server)
+	if err != nil {
+		return nil, err
+	}
+
+	operationPath := fmt.Sprintf("/session_create")
+	if operationPath[0] == '/' {
+		operationPath = "." + operationPath
+	}
+
+	queryURL, err := serverURL.Parse(operationPath)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", queryURL.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return req, nil
+}
+
+func (c *Client) applyEditors(ctx context.Context, req *http.Request, additionalEditors []RequestEditorFn) error {
+	for _, r := range c.RequestEditors {
+		if err := r(ctx, req); err != nil {
+			return err
+		}
+	}
+	for _, r := range additionalEditors {
+		if err := r(ctx, req); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// ClientWithResponses builds on ClientInterface to offer response payloads
+type ClientWithResponses struct {
+	ClientInterface
+}
+
+// NewClientWithResponses creates a new ClientWithResponses, which wraps
+// Client with return type handling
+func NewClientWithResponses(server string, opts ...ClientOption) (*ClientWithResponses, error) {
+	client, err := NewClient(server, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &ClientWithResponses{client}, nil
+}
+
+// WithBaseURL overrides the baseURL.
+func WithBaseURL(baseURL string) ClientOption {
+	return func(c *Client) error {
+		newBaseURL, err := url.Parse(baseURL)
+		if err != nil {
+			return err
+		}
+		c.Server = newBaseURL.String()
+		return nil
+	}
+}
+
+// ClientWithResponsesInterface is the interface specification for the client with responses above.
+type ClientWithResponsesInterface interface {
+	// PostSessionChatWithBodyWithResponse request with any body
+	PostSessionChatWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*PostSessionChatResponse, error)
+
+	PostSessionChatWithResponse(ctx context.Context, body PostSessionChatJSONRequestBody, reqEditors ...RequestEditorFn) (*PostSessionChatResponse, error)
+
+	// PostSessionCreateWithResponse request
+	PostSessionCreateWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostSessionCreateResponse, error)
+}
+
+type PostSessionChatResponse struct {
+	Body         []byte
+	HTTPResponse *http.Response
+}
+
+// Status returns HTTPResponse.Status
+func (r PostSessionChatResponse) Status() string {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.Status
+	}
+	return http.StatusText(0)
+}
+
+// StatusCode returns HTTPResponse.StatusCode
+func (r PostSessionChatResponse) StatusCode() int {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.StatusCode
+	}
+	return 0
+}
+
+type PostSessionCreateResponse struct {
+	Body         []byte
+	HTTPResponse *http.Response
+	JSON200      *SessionInfo
+}
+
+// Status returns HTTPResponse.Status
+func (r PostSessionCreateResponse) Status() string {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.Status
+	}
+	return http.StatusText(0)
+}
+
+// StatusCode returns HTTPResponse.StatusCode
+func (r PostSessionCreateResponse) StatusCode() int {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.StatusCode
+	}
+	return 0
+}
+
+// PostSessionChatWithBodyWithResponse request with arbitrary body returning *PostSessionChatResponse
+func (c *ClientWithResponses) PostSessionChatWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*PostSessionChatResponse, error) {
+	rsp, err := c.PostSessionChatWithBody(ctx, contentType, body, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParsePostSessionChatResponse(rsp)
+}
+
+func (c *ClientWithResponses) PostSessionChatWithResponse(ctx context.Context, body PostSessionChatJSONRequestBody, reqEditors ...RequestEditorFn) (*PostSessionChatResponse, error) {
+	rsp, err := c.PostSessionChat(ctx, body, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParsePostSessionChatResponse(rsp)
+}
+
+// PostSessionCreateWithResponse request returning *PostSessionCreateResponse
+func (c *ClientWithResponses) PostSessionCreateWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostSessionCreateResponse, error) {
+	rsp, err := c.PostSessionCreate(ctx, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParsePostSessionCreateResponse(rsp)
+}
+
+// ParsePostSessionChatResponse parses an HTTP response from a PostSessionChatWithResponse call
+func ParsePostSessionChatResponse(rsp *http.Response) (*PostSessionChatResponse, error) {
+	bodyBytes, err := io.ReadAll(rsp.Body)
+	defer func() { _ = rsp.Body.Close() }()
+	if err != nil {
+		return nil, err
+	}
+
+	response := &PostSessionChatResponse{
+		Body:         bodyBytes,
+		HTTPResponse: rsp,
+	}
+
+	return response, nil
+}
+
+// ParsePostSessionCreateResponse parses an HTTP response from a PostSessionCreateWithResponse call
+func ParsePostSessionCreateResponse(rsp *http.Response) (*PostSessionCreateResponse, error) {
+	bodyBytes, err := io.ReadAll(rsp.Body)
+	defer func() { _ = rsp.Body.Close() }()
+	if err != nil {
+		return nil, err
+	}
+
+	response := &PostSessionCreateResponse{
+		Body:         bodyBytes,
+		HTTPResponse: rsp,
+	}
+
+	switch {
+	case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200:
+		var dest SessionInfo
+		if err := json.Unmarshal(bodyBytes, &dest); err != nil {
+			return nil, err
+		}
+		response.JSON200 = &dest
+
+	}
+
+	return response, nil
+}

pkg/client/generated-event.go

@@ -0,0 +1,35 @@
+// Code generated by github.com/atombender/go-jsonschema, DO NOT EDIT.
+
+package client
+
+import "encoding/json"
+import "fmt"
+
+type EventStorageWrite struct {
+	// Body corresponds to the JSON schema field "body".
+	Body interface{} `json:"body" yaml:"body" mapstructure:"body"`
+
+	// Key corresponds to the JSON schema field "key".
+	Key string `json:"key" yaml:"key" mapstructure:"key"`
+}
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (j *EventStorageWrite) UnmarshalJSON(value []byte) error {
+	var raw map[string]interface{}
+	if err := json.Unmarshal(value, &raw); err != nil {
+		return err
+	}
+	if _, ok := raw["body"]; raw != nil && !ok {
+		return fmt.Errorf("field body in EventStorageWrite: required")
+	}
+	if _, ok := raw["key"]; raw != nil && !ok {
+		return fmt.Errorf("field key in EventStorageWrite: required")
+	}
+	type Plain EventStorageWrite
+	var plain Plain
+	if err := json.Unmarshal(value, &plain); err != nil {
+		return err
+	}
+	*j = EventStorageWrite(plain)
+	return nil
+}

pkg/client/generated.go

@@ -0,0 +1,388 @@
+// Package client provides primitives to interact with the openapi HTTP API.
+//
+// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT.
+package client
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+)
+
+// PostSessionChatJSONBody defines parameters for PostSessionChat.
+type PostSessionChatJSONBody struct {
+	Parts     *interface{} `json:"parts,omitempty"`
+	SessionID string       `json:"sessionID"`
+}
+
+// PostSessionChatJSONRequestBody defines body for PostSessionChat for application/json ContentType.
+type PostSessionChatJSONRequestBody PostSessionChatJSONBody
+
+// RequestEditorFn  is the function signature for the RequestEditor callback function
+type RequestEditorFn func(ctx context.Context, req *http.Request) error
+
+// Doer performs HTTP requests.
+//
+// The standard http.Client implements this interface.
+type HttpRequestDoer interface {
+	Do(req *http.Request) (*http.Response, error)
+}
+
+// Client which conforms to the OpenAPI3 specification for this service.
+type Client struct {
+	// The endpoint of the server conforming to this interface, with scheme,
+	// https://api.deepmap.com for example. This can contain a path relative
+	// to the server, such as https://api.deepmap.com/dev-test, and all the
+	// paths in the swagger spec will be appended to the server.
+	Server string
+
+	// Doer for performing requests, typically a *http.Client with any
+	// customized settings, such as certificate chains.
+	Client HttpRequestDoer
+
+	// A list of callbacks for modifying requests which are generated before sending over
+	// the network.
+	RequestEditors []RequestEditorFn
+}
+
+// ClientOption allows setting custom parameters during construction
+type ClientOption func(*Client) error
+
+// Creates a new Client, with reasonable defaults
+func NewClient(server string, opts ...ClientOption) (*Client, error) {
+	// create a client with sane default values
+	client := Client{
+		Server: server,
+	}
+	// mutate client and add all optional params
+	for _, o := range opts {
+		if err := o(&client); err != nil {
+			return nil, err
+		}
+	}
+	// ensure the server URL always has a trailing slash
+	if !strings.HasSuffix(client.Server, "/") {
+		client.Server += "/"
+	}
+	// create httpClient, if not already present
+	if client.Client == nil {
+		client.Client = &http.Client{}
+	}
+	return &client, nil
+}
+
+// WithHTTPClient allows overriding the default Doer, which is
+// automatically created using http.Client. This is useful for tests.
+func WithHTTPClient(doer HttpRequestDoer) ClientOption {
+	return func(c *Client) error {
+		c.Client = doer
+		return nil
+	}
+}
+
+// WithRequestEditorFn allows setting up a callback function, which will be
+// called right before sending the request. This can be used to mutate the request.
+func WithRequestEditorFn(fn RequestEditorFn) ClientOption {
+	return func(c *Client) error {
+		c.RequestEditors = append(c.RequestEditors, fn)
+		return nil
+	}
+}
+
+// The interface specification for the client above.
+type ClientInterface interface {
+	// PostSessionChatWithBody request with any body
+	PostSessionChatWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error)
+
+	PostSessionChat(ctx context.Context, body PostSessionChatJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error)
+
+	// PostSessionCreate request
+	PostSessionCreate(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error)
+}
+
+func (c *Client) PostSessionChatWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewPostSessionChatRequestWithBody(c.Server, contentType, body)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
+func (c *Client) PostSessionChat(ctx context.Context, body PostSessionChatJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewPostSessionChatRequest(c.Server, body)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
+func (c *Client) PostSessionCreate(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewPostSessionCreateRequest(c.Server)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
+// NewPostSessionChatRequest calls the generic PostSessionChat builder with application/json body
+func NewPostSessionChatRequest(server string, body PostSessionChatJSONRequestBody) (*http.Request, error) {
+	var bodyReader io.Reader
+	buf, err := json.Marshal(body)
+	if err != nil {
+		return nil, err
+	}
+	bodyReader = bytes.NewReader(buf)
+	return NewPostSessionChatRequestWithBody(server, "application/json", bodyReader)
+}
+
+// NewPostSessionChatRequestWithBody generates requests for PostSessionChat with any type of body
+func NewPostSessionChatRequestWithBody(server string, contentType string, body io.Reader) (*http.Request, error) {
+	var err error
+
+	serverURL, err := url.Parse(server)
+	if err != nil {
+		return nil, err
+	}
+
+	operationPath := fmt.Sprintf("/session_chat")
+	if operationPath[0] == '/' {
+		operationPath = "." + operationPath
+	}
+
+	queryURL, err := serverURL.Parse(operationPath)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", queryURL.String(), body)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Add("Content-Type", contentType)
+
+	return req, nil
+}
+
+// NewPostSessionCreateRequest generates requests for PostSessionCreate
+func NewPostSessionCreateRequest(server string) (*http.Request, error) {
+	var err error
+
+	serverURL, err := url.Parse(server)
+	if err != nil {
+		return nil, err
+	}
+
+	operationPath := fmt.Sprintf("/session_create")
+	if operationPath[0] == '/' {
+		operationPath = "." + operationPath
+	}
+
+	queryURL, err := serverURL.Parse(operationPath)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", queryURL.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return req, nil
+}
+
+func (c *Client) applyEditors(ctx context.Context, req *http.Request, additionalEditors []RequestEditorFn) error {
+	for _, r := range c.RequestEditors {
+		if err := r(ctx, req); err != nil {
+			return err
+		}
+	}
+	for _, r := range additionalEditors {
+		if err := r(ctx, req); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// ClientWithResponses builds on ClientInterface to offer response payloads
+type ClientWithResponses struct {
+	ClientInterface
+}
+
+// NewClientWithResponses creates a new ClientWithResponses, which wraps
+// Client with return type handling
+func NewClientWithResponses(server string, opts ...ClientOption) (*ClientWithResponses, error) {
+	client, err := NewClient(server, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &ClientWithResponses{client}, nil
+}
+
+// WithBaseURL overrides the baseURL.
+func WithBaseURL(baseURL string) ClientOption {
+	return func(c *Client) error {
+		newBaseURL, err := url.Parse(baseURL)
+		if err != nil {
+			return err
+		}
+		c.Server = newBaseURL.String()
+		return nil
+	}
+}
+
+// ClientWithResponsesInterface is the interface specification for the client with responses above.
+type ClientWithResponsesInterface interface {
+	// PostSessionChatWithBodyWithResponse request with any body
+	PostSessionChatWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*PostSessionChatResponse, error)
+
+	PostSessionChatWithResponse(ctx context.Context, body PostSessionChatJSONRequestBody, reqEditors ...RequestEditorFn) (*PostSessionChatResponse, error)
+
+	// PostSessionCreateWithResponse request
+	PostSessionCreateWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostSessionCreateResponse, error)
+}
+
+type PostSessionChatResponse struct {
+	Body         []byte
+	HTTPResponse *http.Response
+}
+
+// Status returns HTTPResponse.Status
+func (r PostSessionChatResponse) Status() string {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.Status
+	}
+	return http.StatusText(0)
+}
+
+// StatusCode returns HTTPResponse.StatusCode
+func (r PostSessionChatResponse) StatusCode() int {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.StatusCode
+	}
+	return 0
+}
+
+type PostSessionCreateResponse struct {
+	Body         []byte
+	HTTPResponse *http.Response
+	JSON200      *struct {
+		Id     string `json:"id"`
+		Title  string `json:"title"`
+		Tokens struct {
+			Input     float32 `json:"input"`
+			Output    float32 `json:"output"`
+			Reasoning float32 `json:"reasoning"`
+		} `json:"tokens"`
+	}
+}
+
+// Status returns HTTPResponse.Status
+func (r PostSessionCreateResponse) Status() string {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.Status
+	}
+	return http.StatusText(0)
+}
+
+// StatusCode returns HTTPResponse.StatusCode
+func (r PostSessionCreateResponse) StatusCode() int {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.StatusCode
+	}
+	return 0
+}
+
+// PostSessionChatWithBodyWithResponse request with arbitrary body returning *PostSessionChatResponse
+func (c *ClientWithResponses) PostSessionChatWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*PostSessionChatResponse, error) {
+	rsp, err := c.PostSessionChatWithBody(ctx, contentType, body, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParsePostSessionChatResponse(rsp)
+}
+
+func (c *ClientWithResponses) PostSessionChatWithResponse(ctx context.Context, body PostSessionChatJSONRequestBody, reqEditors ...RequestEditorFn) (*PostSessionChatResponse, error) {
+	rsp, err := c.PostSessionChat(ctx, body, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParsePostSessionChatResponse(rsp)
+}
+
+// PostSessionCreateWithResponse request returning *PostSessionCreateResponse
+func (c *ClientWithResponses) PostSessionCreateWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostSessionCreateResponse, error) {
+	rsp, err := c.PostSessionCreate(ctx, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParsePostSessionCreateResponse(rsp)
+}
+
+// ParsePostSessionChatResponse parses an HTTP response from a PostSessionChatWithResponse call
+func ParsePostSessionChatResponse(rsp *http.Response) (*PostSessionChatResponse, error) {
+	bodyBytes, err := io.ReadAll(rsp.Body)
+	defer func() { _ = rsp.Body.Close() }()
+	if err != nil {
+		return nil, err
+	}
+
+	response := &PostSessionChatResponse{
+		Body:         bodyBytes,
+		HTTPResponse: rsp,
+	}
+
+	return response, nil
+}
+
+// ParsePostSessionCreateResponse parses an HTTP response from a PostSessionCreateWithResponse call
+func ParsePostSessionCreateResponse(rsp *http.Response) (*PostSessionCreateResponse, error) {
+	bodyBytes, err := io.ReadAll(rsp.Body)
+	defer func() { _ = rsp.Body.Close() }()
+	if err != nil {
+		return nil, err
+	}
+
+	response := &PostSessionCreateResponse{
+		Body:         bodyBytes,
+		HTTPResponse: rsp,
+	}
+
+	switch {
+	case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200:
+		var dest struct {
+			Id     string `json:"id"`
+			Title  string `json:"title"`
+			Tokens struct {
+				Input     float32 `json:"input"`
+				Output    float32 `json:"output"`
+				Reasoning float32 `json:"reasoning"`
+			} `json:"tokens"`
+		}
+		if err := json.Unmarshal(bodyBytes, &dest); err != nil {
+			return nil, err
+		}
+		response.JSON200 = &dest
+
+	}
+
+	return response, nil
+}

pkg/global/global.go

@@ -1,38 +0,0 @@
-package global
-
-import (
-	"os"
-	"path/filepath"
-)
-
-var configDir = (func() string {
-	home, err := os.UserConfigDir()
-	if err != nil {
-		panic(err)
-	}
-	result := filepath.Join(home, "sst")
-	os.MkdirAll(result, 0755)
-	os.MkdirAll(filepath.Join(result, "bin"), 0755)
-	return result
-}())
-
-var cacheDir = (func() string {
-	home, err := os.UserCacheDir()
-	if err != nil {
-		panic(err)
-	}
-	result := filepath.Join(home, "sst")
-	os.MkdirAll(result, 0755)
-	return result
-}())
-
-func ConfigDir() string {
-	return configDir
-}
-
-func CacheDir() string {
-	return cacheDir
-}
-
-type Config struct {
-}

pkg/server/server.go

@@ -1,52 +0,0 @@
-package server
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"net"
-	"net/http"
-
-	"github.com/sst/opencode/pkg/app"
-)
-
-type Server struct {
-	app  *app.App
-	mux  *http.ServeMux
-	http *http.Server
-	log  *slog.Logger
-}
-
-func New(app *app.App) (*Server, error) {
-	result := &Server{
-		app: app,
-		mux: http.NewServeMux(),
-		log: slog.With("service", "server"),
-	}
-	result.mux.HandleFunc("/rpc", func(w http.ResponseWriter, r *http.Request) {
-	})
-
-	listener, err := net.Listen("tcp", ":0")
-	if err != nil {
-		return nil, err
-	}
-	port := listener.Addr().(*net.TCPAddr).Port
-	listener.Close()
-	result.log.Info("listening on port", "port", port)
-
-	result.http = &http.Server{
-		Addr:    fmt.Sprintf(":%d", port),
-		Handler: result.mux,
-	}
-
-	return result, nil
-}
-
-func (s *Server) Start(ctx context.Context) error {
-	s.log.Info("starting server")
-	go func() {
-		<-ctx.Done()
-		s.http.Shutdown(context.Background())
-	}()
-	return s.http.ListenAndServe()
-}

pkg/session/session.go

@@ -1 +0,0 @@
-package session

pkg/tui/components/chat/chat.go

@@ -0,0 +1,133 @@
+package chat
+
+import (
+	"fmt"
+	"sort"
+
+	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/x/ansi"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/message"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/version"
+)
+
+type SendMsg struct {
+	Text        string
+	Attachments []message.Attachment
+}
+
+func header(width int) string {
+	return lipgloss.JoinVertical(
+		lipgloss.Top,
+		logo(width),
+		repo(width),
+		"",
+		cwd(width),
+	)
+}
+
+func lspsConfigured(width int) string {
+	cfg := config.Get()
+	title := "LSP Servers"
+	title = ansi.Truncate(title, width, "…")
+
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	lsps := baseStyle.
+		Width(width).
+		Foreground(t.Primary()).
+		Bold(true).
+		Render(title)
+
+	// Get LSP names and sort them for consistent ordering
+	var lspNames []string
+	for name := range cfg.LSP {
+		lspNames = append(lspNames, name)
+	}
+	sort.Strings(lspNames)
+
+	var lspViews []string
+	for _, name := range lspNames {
+		lsp := cfg.LSP[name]
+		lspName := baseStyle.
+			Foreground(t.Text()).
+			Render(fmt.Sprintf("• %s", name))
+
+		cmd := lsp.Command
+		cmd = ansi.Truncate(cmd, width-lipgloss.Width(lspName)-3, "…")
+
+		lspPath := baseStyle.
+			Foreground(t.TextMuted()).
+			Render(fmt.Sprintf(" (%s)", cmd))
+
+		lspViews = append(lspViews,
+			baseStyle.
+				Width(width).
+				Render(
+					lipgloss.JoinHorizontal(
+						lipgloss.Left,
+						lspName,
+						lspPath,
+					),
+				),
+		)
+	}
+
+	return baseStyle.
+		Width(width).
+		Render(
+			lipgloss.JoinVertical(
+				lipgloss.Left,
+				lsps,
+				lipgloss.JoinVertical(
+					lipgloss.Left,
+					lspViews...,
+				),
+			),
+		)
+}
+
+func logo(width int) string {
+	logo := fmt.Sprintf("%s %s", styles.OpenCodeIcon, "OpenCode")
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	versionText := baseStyle.
+		Foreground(t.TextMuted()).
+		Render(version.Version)
+
+	return baseStyle.
+		Bold(true).
+		Width(width).
+		Render(
+			lipgloss.JoinHorizontal(
+				lipgloss.Left,
+				logo,
+				" ",
+				versionText,
+			),
+		)
+}
+
+func repo(width int) string {
+	repo := "github.com/sst/opencode"
+	t := theme.CurrentTheme()
+
+	return styles.BaseStyle().
+		Foreground(t.TextMuted()).
+		Width(width).
+		Render(repo)
+}
+
+func cwd(width int) string {
+	cwd := fmt.Sprintf("cwd: %s", config.WorkingDirectory())
+	t := theme.CurrentTheme()
+
+	return styles.BaseStyle().
+		Foreground(t.TextMuted()).
+		Width(width).
+		Render(cwd)
+}

pkg/tui/components/chat/editor.go

@@ -0,0 +1,411 @@
+package chat
+
+import (
+	"fmt"
+	"log/slog"
+	"os"
+	"os/exec"
+	"slices"
+	"strings"
+	"unicode"
+
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/textarea"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/message"
+	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/tui/components/dialog"
+	"github.com/sst/opencode/internal/tui/image"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+type editorCmp struct {
+	width          int
+	height         int
+	app            *app.App
+	textarea       textarea.Model
+	attachments    []message.Attachment
+	deleteMode     bool
+	history        []string
+	historyIndex   int
+	currentMessage string
+}
+
+type EditorKeyMaps struct {
+	Send       key.Binding
+	OpenEditor key.Binding
+	Paste      key.Binding
+	HistoryUp  key.Binding
+	HistoryDown key.Binding
+}
+
+type bluredEditorKeyMaps struct {
+	Send       key.Binding
+	Focus      key.Binding
+	OpenEditor key.Binding
+}
+type DeleteAttachmentKeyMaps struct {
+	AttachmentDeleteMode key.Binding
+	Escape               key.Binding
+	DeleteAllAttachments key.Binding
+}
+
+var editorMaps = EditorKeyMaps{
+	Send: key.NewBinding(
+		key.WithKeys("enter", "ctrl+s"),
+		key.WithHelp("enter", "send message"),
+	),
+	OpenEditor: key.NewBinding(
+		key.WithKeys("ctrl+e"),
+		key.WithHelp("ctrl+e", "open editor"),
+	),
+	Paste: key.NewBinding(
+		key.WithKeys("ctrl+v"),
+		key.WithHelp("ctrl+v", "paste content"),
+	),
+	HistoryUp: key.NewBinding(
+		key.WithKeys("up"),
+		key.WithHelp("up", "previous message"),
+	),
+	HistoryDown: key.NewBinding(
+		key.WithKeys("down"),
+		key.WithHelp("down", "next message"),
+	),
+}
+
+var DeleteKeyMaps = DeleteAttachmentKeyMaps{
+	AttachmentDeleteMode: key.NewBinding(
+		key.WithKeys("ctrl+r"),
+		key.WithHelp("ctrl+r+{i}", "delete attachment at index i"),
+	),
+	Escape: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "cancel delete mode"),
+	),
+	DeleteAllAttachments: key.NewBinding(
+		key.WithKeys("r"),
+		key.WithHelp("ctrl+r+r", "delete all attachments"),
+	),
+}
+
+const (
+	maxAttachments = 5
+)
+
+func (m *editorCmp) openEditor(value string) tea.Cmd {
+	editor := os.Getenv("EDITOR")
+	if editor == "" {
+		editor = "nvim"
+	}
+
+	tmpfile, err := os.CreateTemp("", "msg_*.md")
+	tmpfile.WriteString(value)
+	if err != nil {
+		status.Error(err.Error())
+		return nil
+	}
+	tmpfile.Close()
+	c := exec.Command(editor, tmpfile.Name()) //nolint:gosec
+	c.Stdin = os.Stdin
+	c.Stdout = os.Stdout
+	c.Stderr = os.Stderr
+	return tea.ExecProcess(c, func(err error) tea.Msg {
+		if err != nil {
+			status.Error(err.Error())
+			return nil
+		}
+		content, err := os.ReadFile(tmpfile.Name())
+		if err != nil {
+			status.Error(err.Error())
+			return nil
+		}
+		if len(content) == 0 {
+			status.Warn("Message is empty")
+			return nil
+		}
+		os.Remove(tmpfile.Name())
+		attachments := m.attachments
+		m.attachments = nil
+		return SendMsg{
+			Text:        string(content),
+			Attachments: attachments,
+		}
+	})
+}
+
+func (m *editorCmp) Init() tea.Cmd {
+	return textarea.Blink
+}
+
+func (m *editorCmp) send() tea.Cmd {
+	if m.app.PrimaryAgent.IsSessionBusy(m.app.CurrentSession.ID) {
+		status.Warn("Agent is working, please wait...")
+		return nil
+	}
+
+	value := m.textarea.Value()
+	m.textarea.Reset()
+	attachments := m.attachments
+
+	// Save to history if not empty and not a duplicate of the last entry
+	if value != "" {
+		if len(m.history) == 0 || m.history[len(m.history)-1] != value {
+			m.history = append(m.history, value)
+		}
+		m.historyIndex = len(m.history)
+		m.currentMessage = ""
+	}
+
+	m.attachments = nil
+	if value == "" {
+		return nil
+	}
+	return tea.Batch(
+		util.CmdHandler(SendMsg{
+			Text:        value,
+			Attachments: attachments,
+		}),
+	)
+}
+
+func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmd tea.Cmd
+	switch msg := msg.(type) {
+	case dialog.ThemeChangedMsg:
+		m.textarea = CreateTextArea(&m.textarea)
+	case dialog.CompletionSelectedMsg:
+		existingValue := m.textarea.Value()
+		modifiedValue := strings.Replace(existingValue, msg.SearchString, msg.CompletionValue, 1)
+
+		m.textarea.SetValue(modifiedValue)
+		return m, nil
+	case dialog.AttachmentAddedMsg:
+		if len(m.attachments) >= maxAttachments {
+			status.Error(fmt.Sprintf("cannot add more than %d images", maxAttachments))
+			return m, cmd
+		}
+		m.attachments = append(m.attachments, msg.Attachment)
+	case tea.KeyMsg:
+		if key.Matches(msg, DeleteKeyMaps.AttachmentDeleteMode) {
+			m.deleteMode = true
+			return m, nil
+		}
+		if key.Matches(msg, DeleteKeyMaps.DeleteAllAttachments) && m.deleteMode {
+			m.deleteMode = false
+			m.attachments = nil
+			return m, nil
+		}
+		if m.deleteMode && len(msg.Runes) > 0 && unicode.IsDigit(msg.Runes[0]) {
+			num := int(msg.Runes[0] - '0')
+			m.deleteMode = false
+			if num < 10 && len(m.attachments) > num {
+				if num == 0 {
+					m.attachments = m.attachments[num+1:]
+				} else {
+					m.attachments = slices.Delete(m.attachments, num, num+1)
+				}
+				return m, nil
+			}
+		}
+		if key.Matches(msg, messageKeys.PageUp) || key.Matches(msg, messageKeys.PageDown) ||
+			key.Matches(msg, messageKeys.HalfPageUp) || key.Matches(msg, messageKeys.HalfPageDown) {
+			return m, nil
+		}
+		if key.Matches(msg, editorMaps.OpenEditor) {
+			if m.app.PrimaryAgent.IsSessionBusy(m.app.CurrentSession.ID) {
+				status.Warn("Agent is working, please wait...")
+				return m, nil
+			}
+			value := m.textarea.Value()
+			m.textarea.Reset()
+			return m, m.openEditor(value)
+		}
+		if key.Matches(msg, DeleteKeyMaps.Escape) {
+			m.deleteMode = false
+			return m, nil
+		}
+
+		if key.Matches(msg, editorMaps.Paste) {
+			imageBytes, text, err := image.GetImageFromClipboard()
+			if err != nil {
+				slog.Error(err.Error())
+				return m, cmd
+			}
+			if len(imageBytes) != 0 {
+				attachmentName := fmt.Sprintf("clipboard-image-%d", len(m.attachments))
+				attachment := message.Attachment{FilePath: attachmentName, FileName: attachmentName, Content: imageBytes, MimeType: "image/png"}
+				m.attachments = append(m.attachments, attachment)
+			} else {
+				m.textarea.SetValue(m.textarea.Value() + text)
+			}
+			return m, cmd
+		}
+
+		// Handle history navigation with up/down arrow keys
+		if m.textarea.Focused() && key.Matches(msg, editorMaps.HistoryUp) {
+			// Get the current line number
+			currentLine := m.textarea.Line()
+			
+			// Only navigate history if we're at the first line
+			if currentLine == 0 && len(m.history) > 0 {
+				// Save current message if we're just starting to navigate
+				if m.historyIndex == len(m.history) {
+					m.currentMessage = m.textarea.Value()
+				}
+				
+				// Go to previous message in history
+				if m.historyIndex > 0 {
+					m.historyIndex--
+					m.textarea.SetValue(m.history[m.historyIndex])
+				}
+				return m, nil
+			}
+		}
+		
+		if m.textarea.Focused() && key.Matches(msg, editorMaps.HistoryDown) {
+			// Get the current line number and total lines
+			currentLine := m.textarea.Line()
+			value := m.textarea.Value()
+			lines := strings.Split(value, "\n")
+			totalLines := len(lines)
+			
+			// Only navigate history if we're at the last line
+			if currentLine == totalLines-1 {
+				if m.historyIndex < len(m.history)-1 {
+					// Go to next message in history
+					m.historyIndex++
+					m.textarea.SetValue(m.history[m.historyIndex])
+				} else if m.historyIndex == len(m.history)-1 {
+					// Return to the current message being composed
+					m.historyIndex = len(m.history)
+					m.textarea.SetValue(m.currentMessage)
+				}
+				return m, nil
+			}
+		}
+
+		// Handle Enter key
+		if m.textarea.Focused() && key.Matches(msg, editorMaps.Send) {
+			value := m.textarea.Value()
+			if len(value) > 0 && value[len(value)-1] == '\\' {
+				// If the last character is a backslash, remove it and add a newline
+				m.textarea.SetValue(value[:len(value)-1] + "\n")
+				return m, nil
+			} else {
+				// Otherwise, send the message
+				return m, m.send()
+			}
+		}
+
+	}
+	m.textarea, cmd = m.textarea.Update(msg)
+	return m, cmd
+}
+
+func (m *editorCmp) View() string {
+	t := theme.CurrentTheme()
+
+	// Style the prompt with theme colors
+	style := lipgloss.NewStyle().
+		Padding(0, 0, 0, 1).
+		Bold(true).
+		Foreground(t.Primary())
+
+	if len(m.attachments) == 0 {
+		return lipgloss.JoinHorizontal(lipgloss.Top, style.Render(">"), m.textarea.View())
+	}
+	m.textarea.SetHeight(m.height - 1)
+	return lipgloss.JoinVertical(lipgloss.Top,
+		m.attachmentsContent(),
+		lipgloss.JoinHorizontal(lipgloss.Top, style.Render(">"),
+			m.textarea.View()),
+	)
+}
+
+func (m *editorCmp) SetSize(width, height int) tea.Cmd {
+	m.width = width
+	m.height = height
+	m.textarea.SetWidth(width - 3) // account for the prompt and padding right
+	m.textarea.SetHeight(height)
+	return nil
+}
+
+func (m *editorCmp) GetSize() (int, int) {
+	return m.textarea.Width(), m.textarea.Height()
+}
+
+func (m *editorCmp) attachmentsContent() string {
+	var styledAttachments []string
+	t := theme.CurrentTheme()
+	attachmentStyles := styles.BaseStyle().
+		MarginLeft(1).
+		Background(t.TextMuted()).
+		Foreground(t.Text())
+	for i, attachment := range m.attachments {
+		var filename string
+		if len(attachment.FileName) > 10 {
+			filename = fmt.Sprintf(" %s %s...", styles.DocumentIcon, attachment.FileName[0:7])
+		} else {
+			filename = fmt.Sprintf(" %s %s", styles.DocumentIcon, attachment.FileName)
+		}
+		if m.deleteMode {
+			filename = fmt.Sprintf("%d%s", i, filename)
+		}
+		styledAttachments = append(styledAttachments, attachmentStyles.Render(filename))
+	}
+	content := lipgloss.JoinHorizontal(lipgloss.Left, styledAttachments...)
+	return content
+}
+
+func (m *editorCmp) BindingKeys() []key.Binding {
+	bindings := []key.Binding{}
+	bindings = append(bindings, layout.KeyMapToSlice(editorMaps)...)
+	bindings = append(bindings, layout.KeyMapToSlice(DeleteKeyMaps)...)
+	return bindings
+}
+
+func CreateTextArea(existing *textarea.Model) textarea.Model {
+	t := theme.CurrentTheme()
+	bgColor := t.Background()
+	textColor := t.Text()
+	textMutedColor := t.TextMuted()
+
+	ta := textarea.New()
+	ta.BlurredStyle.Base = styles.BaseStyle().Background(bgColor).Foreground(textColor)
+	ta.BlurredStyle.CursorLine = styles.BaseStyle().Background(bgColor)
+	ta.BlurredStyle.Placeholder = styles.BaseStyle().Background(bgColor).Foreground(textMutedColor)
+	ta.BlurredStyle.Text = styles.BaseStyle().Background(bgColor).Foreground(textColor)
+	ta.FocusedStyle.Base = styles.BaseStyle().Background(bgColor).Foreground(textColor)
+	ta.FocusedStyle.CursorLine = styles.BaseStyle().Background(bgColor)
+	ta.FocusedStyle.Placeholder = styles.BaseStyle().Background(bgColor).Foreground(textMutedColor)
+	ta.FocusedStyle.Text = styles.BaseStyle().Background(bgColor).Foreground(textColor)
+
+	ta.Prompt = " "
+	ta.ShowLineNumbers = false
+	ta.CharLimit = -1
+
+	if existing != nil {
+		ta.SetValue(existing.Value())
+		ta.SetWidth(existing.Width())
+		ta.SetHeight(existing.Height())
+	}
+
+	ta.Focus()
+	return ta
+}
+
+func NewEditorCmp(app *app.App) tea.Model {
+	ta := CreateTextArea(nil)
+	return &editorCmp{
+		app:          app,
+		textarea:     ta,
+		history:      []string{},
+		historyIndex: 0,
+		currentMessage: "",
+	}
+}

pkg/tui/components/chat/message.go

@@ -0,0 +1,704 @@
+package chat
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/x/ansi"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/diff"
+	"github.com/sst/opencode/internal/llm/agent"
+	"github.com/sst/opencode/internal/llm/models"
+	"github.com/sst/opencode/internal/llm/tools"
+	"github.com/sst/opencode/internal/message"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type uiMessageType int
+
+const (
+	userMessageType uiMessageType = iota
+	assistantMessageType
+	toolMessageType
+
+	maxResultHeight = 10
+)
+
+type uiMessage struct {
+	ID          string
+	messageType uiMessageType
+	position    int
+	height      int
+	content     string
+}
+
+func toMarkdown(content string, focused bool, width int) string {
+	r := styles.GetMarkdownRenderer(width)
+	rendered, _ := r.Render(content)
+	return rendered
+}
+
+func renderMessage(msg string, isUser bool, isFocused bool, width int, info ...string) string {
+	t := theme.CurrentTheme()
+
+	style := styles.BaseStyle().
+		Width(width - 1).
+		BorderLeft(true).
+		Foreground(t.TextMuted()).
+		BorderForeground(t.Primary()).
+		BorderStyle(lipgloss.ThickBorder())
+
+	if isUser {
+		style = style.BorderForeground(t.Secondary())
+	}
+
+	// Apply markdown formatting and handle background color
+	parts := []string{
+		styles.ForceReplaceBackgroundWithLipgloss(toMarkdown(msg, isFocused, width), t.Background()),
+	}
+
+	// Remove newline at the end
+	parts[0] = strings.TrimSuffix(parts[0], "\n")
+	if len(info) > 0 {
+		parts = append(parts, info...)
+	}
+
+	rendered := style.Render(
+		lipgloss.JoinVertical(
+			lipgloss.Left,
+			parts...,
+		),
+	)
+
+	return rendered
+}
+
+func renderUserMessage(msg message.Message, isFocused bool, width int, position int) uiMessage {
+	var styledAttachments []string
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+	attachmentStyles := baseStyle.
+		MarginLeft(1).
+		Background(t.TextMuted()).
+		Foreground(t.Text())
+	for _, attachment := range msg.BinaryContent() {
+		file := filepath.Base(attachment.Path)
+		var filename string
+		if len(file) > 10 {
+			filename = fmt.Sprintf(" %s %s...", styles.DocumentIcon, file[0:7])
+		} else {
+			filename = fmt.Sprintf(" %s %s", styles.DocumentIcon, file)
+		}
+		styledAttachments = append(styledAttachments, attachmentStyles.Render(filename))
+	}
+
+	// Add timestamp info
+	info := []string{}
+	timestamp := msg.CreatedAt.Local().Format("02 Jan 2006 03:04 PM")
+	username, _ := config.GetUsername()
+	info = append(info, baseStyle.
+		Width(width-1).
+		Foreground(t.TextMuted()).
+		Render(fmt.Sprintf(" %s (%s)", username, timestamp)),
+	)
+
+	content := ""
+	if len(styledAttachments) > 0 {
+		attachmentContent := baseStyle.Width(width).Render(lipgloss.JoinHorizontal(lipgloss.Left, styledAttachments...))
+		content = renderMessage(msg.Content().String(), true, isFocused, width, append(info, attachmentContent)...)
+	} else {
+		content = renderMessage(msg.Content().String(), true, isFocused, width, info...)
+	}
+	userMsg := uiMessage{
+		ID:          msg.ID,
+		messageType: userMessageType,
+		position:    position,
+		height:      lipgloss.Height(content),
+		content:     content,
+	}
+	return userMsg
+}
+
+// Returns multiple uiMessages because of the tool calls
+func renderAssistantMessage(
+	msg message.Message,
+	msgIndex int,
+	allMessages []message.Message, // we need this to get tool results and the user message
+	messagesService message.Service, // We need this to get the task tool messages
+	focusedUIMessageId string,
+	width int,
+	position int,
+	showToolMessages bool,
+) []uiMessage {
+	messages := []uiMessage{}
+	content := strings.TrimSpace(msg.Content().String())
+	thinking := msg.IsThinking()
+	thinkingContent := msg.ReasoningContent().Thinking
+	finished := msg.IsFinished()
+	finishData := msg.FinishPart()
+	info := []string{}
+
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	// Always add timestamp info
+	timestamp := msg.CreatedAt.Local().Format("02 Jan 2006 03:04 PM")
+	modelName := "Assistant"
+	if msg.Model != "" {
+		modelName = models.SupportedModels[msg.Model].Name
+	}
+
+	info = append(info, baseStyle.
+		Width(width-1).
+		Foreground(t.TextMuted()).
+		Render(fmt.Sprintf(" %s (%s)", modelName, timestamp)),
+	)
+
+	if finished {
+		// Add finish info if available
+		switch finishData.Reason {
+		case message.FinishReasonCanceled:
+			info = append(info, baseStyle.
+				Width(width-1).
+				Foreground(t.Warning()).
+				Render("(canceled)"),
+			)
+		case message.FinishReasonError:
+			info = append(info, baseStyle.
+				Width(width-1).
+				Foreground(t.Error()).
+				Render("(error)"),
+			)
+		case message.FinishReasonPermissionDenied:
+			info = append(info, baseStyle.
+				Width(width-1).
+				Foreground(t.Info()).
+				Render("(permission denied)"),
+			)
+		}
+	}
+
+	if content != "" || (finished && finishData.Reason == message.FinishReasonEndTurn) {
+		if content == "" {
+			content = "*Finished without output*"
+		}
+
+		content = renderMessage(content, false, true, width, info...)
+		messages = append(messages, uiMessage{
+			ID:          msg.ID,
+			messageType: assistantMessageType,
+			position:    position,
+			height:      lipgloss.Height(content),
+			content:     content,
+		})
+		position += messages[0].height
+		position++ // for the space
+	} else if thinking && thinkingContent != "" {
+		// Render the thinking content with timestamp
+		content = renderMessage(thinkingContent, false, msg.ID == focusedUIMessageId, width, info...)
+		messages = append(messages, uiMessage{
+			ID:          msg.ID,
+			messageType: assistantMessageType,
+			position:    position,
+			height:      lipgloss.Height(content),
+			content:     content,
+		})
+		position += lipgloss.Height(content)
+		position++ // for the space
+	}
+
+	// Only render tool messages if they should be shown
+	if showToolMessages {
+		for i, toolCall := range msg.ToolCalls() {
+			toolCallContent := renderToolMessage(
+				toolCall,
+				allMessages,
+				messagesService,
+				focusedUIMessageId,
+				false,
+				width,
+				i+1,
+			)
+			messages = append(messages, toolCallContent)
+			position += toolCallContent.height
+			position++ // for the space
+		}
+	}
+	return messages
+}
+
+func findToolResponse(toolCallID string, futureMessages []message.Message) *message.ToolResult {
+	for _, msg := range futureMessages {
+		for _, result := range msg.ToolResults() {
+			if result.ToolCallID == toolCallID {
+				return &result
+			}
+		}
+	}
+	return nil
+}
+
+func toolName(name string) string {
+	switch name {
+	case agent.AgentToolName:
+		return "Task"
+	case tools.BashToolName:
+		return "Bash"
+	case tools.EditToolName:
+		return "Edit"
+	case tools.FetchToolName:
+		return "Fetch"
+	case tools.GlobToolName:
+		return "Glob"
+	case tools.GrepToolName:
+		return "Grep"
+	case tools.LSToolName:
+		return "List"
+	case tools.ViewToolName:
+		return "View"
+	case tools.WriteToolName:
+		return "Write"
+	case tools.PatchToolName:
+		return "Patch"
+	case tools.BatchToolName:
+		return "Batch"
+	}
+	return name
+}
+
+func getToolAction(name string) string {
+	switch name {
+	case agent.AgentToolName:
+		return "Preparing prompt..."
+	case tools.BashToolName:
+		return "Building command..."
+	case tools.EditToolName:
+		return "Preparing edit..."
+	case tools.FetchToolName:
+		return "Writing fetch..."
+	case tools.GlobToolName:
+		return "Finding files..."
+	case tools.GrepToolName:
+		return "Searching content..."
+	case tools.LSToolName:
+		return "Listing directory..."
+	case tools.ViewToolName:
+		return "Reading file..."
+	case tools.WriteToolName:
+		return "Preparing write..."
+	case tools.PatchToolName:
+		return "Preparing patch..."
+	case tools.BatchToolName:
+		return "Running batch operations..."
+	}
+	return "Working..."
+}
+
+// renders params, params[0] (params[1]=params[2] ....)
+func renderParams(paramsWidth int, params ...string) string {
+	if len(params) == 0 {
+		return ""
+	}
+	mainParam := params[0]
+	if len(mainParam) > paramsWidth {
+		mainParam = mainParam[:paramsWidth-3] + "..."
+	}
+
+	if len(params) == 1 {
+		return mainParam
+	}
+	otherParams := params[1:]
+	// create pairs of key/value
+	// if odd number of params, the last one is a key without value
+	if len(otherParams)%2 != 0 {
+		otherParams = append(otherParams, "")
+	}
+	parts := make([]string, 0, len(otherParams)/2)
+	for i := 0; i < len(otherParams); i += 2 {
+		key := otherParams[i]
+		value := otherParams[i+1]
+		if value == "" {
+			continue
+		}
+		parts = append(parts, fmt.Sprintf("%s=%s", key, value))
+	}
+
+	partsRendered := strings.Join(parts, ", ")
+	remainingWidth := paramsWidth - lipgloss.Width(partsRendered) - 5 // for the space
+	if remainingWidth < 30 {
+		// No space for the params, just show the main
+		return mainParam
+	}
+
+	if len(parts) > 0 {
+		mainParam = fmt.Sprintf("%s (%s)", mainParam, strings.Join(parts, ", "))
+	}
+
+	return ansi.Truncate(mainParam, paramsWidth, "...")
+}
+
+func removeWorkingDirPrefix(path string) string {
+	wd := config.WorkingDirectory()
+	if strings.HasPrefix(path, wd) {
+		path = strings.TrimPrefix(path, wd)
+	}
+	if strings.HasPrefix(path, "/") {
+		path = strings.TrimPrefix(path, "/")
+	}
+	if strings.HasPrefix(path, "./") {
+		path = strings.TrimPrefix(path, "./")
+	}
+	if strings.HasPrefix(path, "../") {
+		path = strings.TrimPrefix(path, "../")
+	}
+	return path
+}
+
+func renderToolParams(paramWidth int, toolCall message.ToolCall) string {
+	params := ""
+	switch toolCall.Name {
+	case agent.AgentToolName:
+		var params agent.AgentParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		prompt := strings.ReplaceAll(params.Prompt, "\n", " ")
+		return renderParams(paramWidth, prompt)
+	case tools.BashToolName:
+		var params tools.BashParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		command := strings.ReplaceAll(params.Command, "\n", " ")
+		return renderParams(paramWidth, command)
+	case tools.EditToolName:
+		var params tools.EditParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		filePath := removeWorkingDirPrefix(params.FilePath)
+		return renderParams(paramWidth, filePath)
+	case tools.FetchToolName:
+		var params tools.FetchParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		url := params.URL
+		toolParams := []string{
+			url,
+		}
+		if params.Format != "" {
+			toolParams = append(toolParams, "format", params.Format)
+		}
+		if params.Timeout != 0 {
+			toolParams = append(toolParams, "timeout", (time.Duration(params.Timeout) * time.Second).String())
+		}
+		return renderParams(paramWidth, toolParams...)
+	case tools.GlobToolName:
+		var params tools.GlobParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		pattern := params.Pattern
+		toolParams := []string{
+			pattern,
+		}
+		if params.Path != "" {
+			toolParams = append(toolParams, "path", params.Path)
+		}
+		return renderParams(paramWidth, toolParams...)
+	case tools.GrepToolName:
+		var params tools.GrepParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		pattern := params.Pattern
+		toolParams := []string{
+			pattern,
+		}
+		if params.Path != "" {
+			toolParams = append(toolParams, "path", params.Path)
+		}
+		if params.Include != "" {
+			toolParams = append(toolParams, "include", params.Include)
+		}
+		if params.LiteralText {
+			toolParams = append(toolParams, "literal", "true")
+		}
+		return renderParams(paramWidth, toolParams...)
+	case tools.LSToolName:
+		var params tools.LSParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		path := params.Path
+		if path == "" {
+			path = "."
+		}
+		return renderParams(paramWidth, path)
+	case tools.ViewToolName:
+		var params tools.ViewParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		filePath := removeWorkingDirPrefix(params.FilePath)
+		toolParams := []string{
+			filePath,
+		}
+		if params.Limit != 0 {
+			toolParams = append(toolParams, "limit", fmt.Sprintf("%d", params.Limit))
+		}
+		if params.Offset != 0 {
+			toolParams = append(toolParams, "offset", fmt.Sprintf("%d", params.Offset))
+		}
+		return renderParams(paramWidth, toolParams...)
+	case tools.WriteToolName:
+		var params tools.WriteParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		filePath := removeWorkingDirPrefix(params.FilePath)
+		return renderParams(paramWidth, filePath)
+	case tools.BatchToolName:
+		var params tools.BatchParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		return renderParams(paramWidth, fmt.Sprintf("%d parallel calls", len(params.Calls)))
+	default:
+		input := strings.ReplaceAll(toolCall.Input, "\n", " ")
+		params = renderParams(paramWidth, input)
+	}
+	return params
+}
+
+func truncateHeight(content string, height int) string {
+	lines := strings.Split(content, "\n")
+	if len(lines) > height {
+		return strings.Join(lines[:height], "\n")
+	}
+	return content
+}
+
+func renderToolResponse(toolCall message.ToolCall, response message.ToolResult, width int) string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	if response.IsError {
+		errContent := fmt.Sprintf("Error: %s", strings.ReplaceAll(response.Content, "\n", " "))
+		errContent = ansi.Truncate(errContent, width-1, "...")
+		return baseStyle.
+			Width(width).
+			Foreground(t.Error()).
+			Render(errContent)
+	}
+
+	resultContent := truncateHeight(response.Content, maxResultHeight)
+	switch toolCall.Name {
+	case agent.AgentToolName:
+		return styles.ForceReplaceBackgroundWithLipgloss(
+			toMarkdown(resultContent, false, width),
+			t.Background(),
+		)
+	case tools.BashToolName:
+		resultContent = fmt.Sprintf("```bash\n%s\n```", resultContent)
+		return styles.ForceReplaceBackgroundWithLipgloss(
+			toMarkdown(resultContent, true, width),
+			t.Background(),
+		)
+	case tools.EditToolName:
+		metadata := tools.EditResponseMetadata{}
+		json.Unmarshal([]byte(response.Metadata), &metadata)
+		formattedDiff, _ := diff.FormatDiff(metadata.Diff, diff.WithTotalWidth(width))
+		return formattedDiff
+	case tools.FetchToolName:
+		var params tools.FetchParams
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		mdFormat := "markdown"
+		switch params.Format {
+		case "text":
+			mdFormat = "text"
+		case "html":
+			mdFormat = "html"
+		}
+		resultContent = fmt.Sprintf("```%s\n%s\n```", mdFormat, resultContent)
+		return styles.ForceReplaceBackgroundWithLipgloss(
+			toMarkdown(resultContent, true, width),
+			t.Background(),
+		)
+	case tools.GlobToolName:
+		return baseStyle.Width(width).Foreground(t.TextMuted()).Render(resultContent)
+	case tools.GrepToolName:
+		return baseStyle.Width(width).Foreground(t.TextMuted()).Render(resultContent)
+	case tools.LSToolName:
+		return baseStyle.Width(width).Foreground(t.TextMuted()).Render(resultContent)
+	case tools.ViewToolName:
+		metadata := tools.ViewResponseMetadata{}
+		json.Unmarshal([]byte(response.Metadata), &metadata)
+		ext := filepath.Ext(metadata.FilePath)
+		if ext == "" {
+			ext = ""
+		} else {
+			ext = strings.ToLower(ext[1:])
+		}
+		resultContent = fmt.Sprintf("```%s\n%s\n```", ext, truncateHeight(metadata.Content, maxResultHeight))
+		return styles.ForceReplaceBackgroundWithLipgloss(
+			toMarkdown(resultContent, true, width),
+			t.Background(),
+		)
+	case tools.WriteToolName:
+		params := tools.WriteParams{}
+		json.Unmarshal([]byte(toolCall.Input), &params)
+		metadata := tools.WriteResponseMetadata{}
+		json.Unmarshal([]byte(response.Metadata), &metadata)
+		ext := filepath.Ext(params.FilePath)
+		if ext == "" {
+			ext = ""
+		} else {
+			ext = strings.ToLower(ext[1:])
+		}
+		resultContent = fmt.Sprintf("```%s\n%s\n```", ext, truncateHeight(params.Content, maxResultHeight))
+		return styles.ForceReplaceBackgroundWithLipgloss(
+			toMarkdown(resultContent, true, width),
+			t.Background(),
+		)
+	case tools.BatchToolName:
+		var batchResult tools.BatchResult
+		if err := json.Unmarshal([]byte(resultContent), &batchResult); err != nil {
+			return baseStyle.Width(width).Foreground(t.Error()).Render(fmt.Sprintf("Error parsing batch result: %s", err))
+		}
+
+		var toolCalls []string
+		for i, result := range batchResult.Results {
+			toolName := toolName(result.ToolName)
+
+			// Format the tool input as a string
+			inputStr := string(result.ToolInput)
+
+			// Format the result
+			var resultStr string
+			if result.Error != "" {
+				resultStr = fmt.Sprintf("Error: %s", result.Error)
+			} else {
+				var toolResponse tools.ToolResponse
+				if err := json.Unmarshal(result.Result, &toolResponse); err != nil {
+					resultStr = "Error parsing tool response"
+				} else {
+					resultStr = truncateHeight(toolResponse.Content, 3)
+				}
+			}
+
+			// Format the tool call
+			toolCall := fmt.Sprintf("%d. %s: %s\n   %s", i+1, toolName, inputStr, resultStr)
+			toolCalls = append(toolCalls, toolCall)
+		}
+
+		return baseStyle.Width(width).Foreground(t.TextMuted()).Render(strings.Join(toolCalls, "\n\n"))
+	default:
+		resultContent = fmt.Sprintf("```text\n%s\n```", resultContent)
+		return styles.ForceReplaceBackgroundWithLipgloss(
+			toMarkdown(resultContent, true, width),
+			t.Background(),
+		)
+	}
+}
+
+func renderToolMessage(
+	toolCall message.ToolCall,
+	allMessages []message.Message,
+	messagesService message.Service,
+	focusedUIMessageId string,
+	nested bool,
+	width int,
+	position int,
+) uiMessage {
+	if nested {
+		width = width - 3
+	}
+
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	style := baseStyle.
+		Width(width - 1).
+		BorderLeft(true).
+		BorderStyle(lipgloss.ThickBorder()).
+		PaddingLeft(1).
+		BorderForeground(t.TextMuted())
+
+	response := findToolResponse(toolCall.ID, allMessages)
+	toolNameText := baseStyle.Foreground(t.TextMuted()).
+		Render(fmt.Sprintf("%s: ", toolName(toolCall.Name)))
+
+	if !toolCall.Finished {
+		// Get a brief description of what the tool is doing
+		toolAction := getToolAction(toolCall.Name)
+
+		progressText := baseStyle.
+			Width(width - 2 - lipgloss.Width(toolNameText)).
+			Foreground(t.TextMuted()).
+			Render(fmt.Sprintf("%s", toolAction))
+
+		content := style.Render(lipgloss.JoinHorizontal(lipgloss.Left, toolNameText, progressText))
+		toolMsg := uiMessage{
+			messageType: toolMessageType,
+			position:    position,
+			height:      lipgloss.Height(content),
+			content:     content,
+		}
+		return toolMsg
+	}
+
+	params := renderToolParams(width-1-lipgloss.Width(toolNameText), toolCall)
+	responseContent := ""
+	if response != nil {
+		responseContent = renderToolResponse(toolCall, *response, width-2)
+		responseContent = strings.TrimSuffix(responseContent, "\n")
+	} else {
+		responseContent = baseStyle.
+			Italic(true).
+			Width(width - 2).
+			Foreground(t.TextMuted()).
+			Render("Waiting for response...")
+	}
+
+	parts := []string{}
+	if !nested {
+		formattedParams := baseStyle.
+			Width(width - 2 - lipgloss.Width(toolNameText)).
+			Foreground(t.TextMuted()).
+			Render(params)
+
+		parts = append(parts, lipgloss.JoinHorizontal(lipgloss.Left, toolNameText, formattedParams))
+	} else {
+		prefix := baseStyle.
+			Foreground(t.TextMuted()).
+			Render(" └ ")
+		formattedParams := baseStyle.
+			Width(width - 2 - lipgloss.Width(toolNameText)).
+			Foreground(t.TextMuted()).
+			Render(params)
+		parts = append(parts, lipgloss.JoinHorizontal(lipgloss.Left, prefix, toolNameText, formattedParams))
+	}
+
+	if toolCall.Name == agent.AgentToolName {
+		taskMessages, _ := messagesService.List(context.Background(), toolCall.ID)
+		toolCalls := []message.ToolCall{}
+		for _, v := range taskMessages {
+			toolCalls = append(toolCalls, v.ToolCalls()...)
+		}
+		for _, call := range toolCalls {
+			rendered := renderToolMessage(call, []message.Message{}, messagesService, focusedUIMessageId, true, width, 0)
+			parts = append(parts, rendered.content)
+		}
+	}
+	if responseContent != "" && !nested {
+		parts = append(parts, responseContent)
+	}
+
+	content := style.Render(
+		lipgloss.JoinVertical(
+			lipgloss.Left,
+			parts...,
+		),
+	)
+	if nested {
+		content = lipgloss.JoinVertical(
+			lipgloss.Left,
+			parts...,
+		)
+	}
+	toolMsg := uiMessage{
+		messageType: toolMessageType,
+		position:    position,
+		height:      lipgloss.Height(content),
+		content:     content,
+	}
+	return toolMsg
+}

pkg/tui/components/chat/messages.go

@@ -0,0 +1,485 @@
+package chat
+
+import (
+	"context"
+	"fmt"
+	"math"
+	"time"
+
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/spinner"
+	"github.com/charmbracelet/bubbles/viewport"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/message"
+	"github.com/sst/opencode/internal/pubsub"
+	"github.com/sst/opencode/internal/session"
+	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/tui/components/dialog"
+	"github.com/sst/opencode/internal/tui/state"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type cacheItem struct {
+	width   int
+	content []uiMessage
+}
+
+type messagesCmp struct {
+	app              *app.App
+	width, height    int
+	viewport         viewport.Model
+	messages         []message.Message
+	uiMessages       []uiMessage
+	currentMsgID     string
+	cachedContent    map[string]cacheItem
+	spinner          spinner.Model
+	rendering        bool
+	attachments      viewport.Model
+	showToolMessages bool
+}
+type renderFinishedMsg struct{}
+type ToggleToolMessagesMsg struct{}
+
+type MessageKeys struct {
+	PageDown     key.Binding
+	PageUp       key.Binding
+	HalfPageUp   key.Binding
+	HalfPageDown key.Binding
+}
+
+var messageKeys = MessageKeys{
+	PageDown: key.NewBinding(
+		key.WithKeys("pgdown"),
+		key.WithHelp("f/pgdn", "page down"),
+	),
+	PageUp: key.NewBinding(
+		key.WithKeys("pgup"),
+		key.WithHelp("b/pgup", "page up"),
+	),
+	HalfPageUp: key.NewBinding(
+		key.WithKeys("ctrl+u"),
+		key.WithHelp("ctrl+u", "½ page up"),
+	),
+	HalfPageDown: key.NewBinding(
+		key.WithKeys("ctrl+d", "ctrl+d"),
+		key.WithHelp("ctrl+d", "½ page down"),
+	),
+}
+
+func (m *messagesCmp) Init() tea.Cmd {
+	return tea.Batch(m.viewport.Init(), m.spinner.Tick)
+}
+
+func (m *messagesCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	switch msg := msg.(type) {
+	case dialog.ThemeChangedMsg:
+		m.rerender()
+		return m, nil
+	case ToggleToolMessagesMsg:
+		m.showToolMessages = !m.showToolMessages
+		// Clear the cache to force re-rendering of all messages
+		m.cachedContent = make(map[string]cacheItem)
+		m.renderView()
+		return m, nil
+	case state.SessionSelectedMsg:
+		cmd := m.Reload(msg)
+		return m, cmd
+	case state.SessionClearedMsg:
+		m.messages = make([]message.Message, 0)
+		m.currentMsgID = ""
+		m.rendering = false
+		return m, nil
+	case tea.KeyMsg:
+		if key.Matches(msg, messageKeys.PageUp) || key.Matches(msg, messageKeys.PageDown) ||
+			key.Matches(msg, messageKeys.HalfPageUp) || key.Matches(msg, messageKeys.HalfPageDown) {
+			u, cmd := m.viewport.Update(msg)
+			m.viewport = u
+			cmds = append(cmds, cmd)
+		}
+	case renderFinishedMsg:
+		m.rendering = false
+		m.viewport.GotoBottom()
+	case pubsub.Event[message.Message]:
+		needsRerender := false
+		if msg.Type == message.EventMessageCreated {
+			if msg.Payload.SessionID == m.app.CurrentSession.ID {
+				messageExists := false
+				for _, v := range m.messages {
+					if v.ID == msg.Payload.ID {
+						messageExists = true
+						break
+					}
+				}
+
+				if !messageExists {
+					if len(m.messages) > 0 {
+						lastMsgID := m.messages[len(m.messages)-1].ID
+						delete(m.cachedContent, lastMsgID)
+					}
+
+					m.messages = append(m.messages, msg.Payload)
+					delete(m.cachedContent, m.currentMsgID)
+					m.currentMsgID = msg.Payload.ID
+					needsRerender = true
+				}
+			}
+			// There are tool calls from the child task
+			for _, v := range m.messages {
+				for _, c := range v.ToolCalls() {
+					if c.ID == msg.Payload.SessionID {
+						delete(m.cachedContent, v.ID)
+						needsRerender = true
+					}
+				}
+			}
+		} else if msg.Type == message.EventMessageUpdated && msg.Payload.SessionID == m.app.CurrentSession.ID {
+			for i, v := range m.messages {
+				if v.ID == msg.Payload.ID {
+					m.messages[i] = msg.Payload
+					delete(m.cachedContent, msg.Payload.ID)
+					needsRerender = true
+					break
+				}
+			}
+		}
+		if needsRerender {
+			m.renderView()
+			if len(m.messages) > 0 {
+				if (msg.Type == message.EventMessageCreated) ||
+					(msg.Type == message.EventMessageUpdated && msg.Payload.ID == m.messages[len(m.messages)-1].ID) {
+					m.viewport.GotoBottom()
+				}
+			}
+		}
+	}
+
+	spinner, cmd := m.spinner.Update(msg)
+	m.spinner = spinner
+	cmds = append(cmds, cmd)
+	return m, tea.Batch(cmds...)
+}
+
+func (m *messagesCmp) IsAgentWorking() bool {
+	return m.app.PrimaryAgent.IsSessionBusy(m.app.CurrentSession.ID)
+}
+
+func formatTimeDifference(unixTime1, unixTime2 int64) string {
+	diffSeconds := float64(math.Abs(float64(unixTime2 - unixTime1)))
+
+	if diffSeconds < 60 {
+		return fmt.Sprintf("%.1fs", diffSeconds)
+	}
+
+	minutes := int(diffSeconds / 60)
+	seconds := int(diffSeconds) % 60
+	return fmt.Sprintf("%dm%ds", minutes, seconds)
+}
+
+func (m *messagesCmp) renderView() {
+	m.uiMessages = make([]uiMessage, 0)
+	pos := 0
+	baseStyle := styles.BaseStyle()
+
+	if m.width == 0 {
+		return
+	}
+	for inx, msg := range m.messages {
+		switch msg.Role {
+		case message.User:
+			if cache, ok := m.cachedContent[msg.ID]; ok && cache.width == m.width {
+				m.uiMessages = append(m.uiMessages, cache.content...)
+				continue
+			}
+			userMsg := renderUserMessage(
+				msg,
+				msg.ID == m.currentMsgID,
+				m.width,
+				pos,
+			)
+			m.uiMessages = append(m.uiMessages, userMsg)
+			m.cachedContent[msg.ID] = cacheItem{
+				width:   m.width,
+				content: []uiMessage{userMsg},
+			}
+			pos += userMsg.height + 1 // + 1 for spacing
+		case message.Assistant:
+			if cache, ok := m.cachedContent[msg.ID]; ok && cache.width == m.width {
+				m.uiMessages = append(m.uiMessages, cache.content...)
+				continue
+			}
+			assistantMessages := renderAssistantMessage(
+				msg,
+				inx,
+				m.messages,
+				m.app.Messages,
+				m.currentMsgID,
+				m.width,
+				pos,
+				m.showToolMessages,
+			)
+			for _, msg := range assistantMessages {
+				m.uiMessages = append(m.uiMessages, msg)
+				pos += msg.height + 1 // + 1 for spacing
+			}
+			m.cachedContent[msg.ID] = cacheItem{
+				width:   m.width,
+				content: assistantMessages,
+			}
+		}
+	}
+
+	messages := make([]string, 0)
+	for _, v := range m.uiMessages {
+		messages = append(messages, lipgloss.JoinVertical(lipgloss.Left, v.content),
+			baseStyle.
+				Width(m.width).
+				Render(
+					"",
+				),
+		)
+	}
+
+	m.viewport.SetContent(
+		baseStyle.
+			Width(m.width).
+			Render(
+				lipgloss.JoinVertical(
+					lipgloss.Top,
+					messages...,
+				),
+			),
+	)
+}
+
+func (m *messagesCmp) View() string {
+	baseStyle := styles.BaseStyle()
+
+	if m.rendering {
+		return baseStyle.
+			Width(m.width).
+			Render(
+				lipgloss.JoinVertical(
+					lipgloss.Top,
+					"Loading...",
+					m.working(),
+					m.help(),
+				),
+			)
+	}
+	if len(m.messages) == 0 {
+		content := baseStyle.
+			Width(m.width).
+			Height(m.height - 1).
+			Render(
+				m.initialScreen(),
+			)
+
+		return baseStyle.
+			Width(m.width).
+			Render(
+				lipgloss.JoinVertical(
+					lipgloss.Top,
+					content,
+					"",
+					m.help(),
+				),
+			)
+	}
+
+	return baseStyle.
+		Width(m.width).
+		Render(
+			lipgloss.JoinVertical(
+				lipgloss.Top,
+				m.viewport.View(),
+				m.working(),
+				m.help(),
+			),
+		)
+}
+
+func hasToolsWithoutResponse(messages []message.Message) bool {
+	toolCalls := make([]message.ToolCall, 0)
+	toolResults := make([]message.ToolResult, 0)
+	for _, m := range messages {
+		toolCalls = append(toolCalls, m.ToolCalls()...)
+		toolResults = append(toolResults, m.ToolResults()...)
+	}
+
+	for _, v := range toolCalls {
+		found := false
+		for _, r := range toolResults {
+			if v.ID == r.ToolCallID {
+				found = true
+				break
+			}
+		}
+		if !found && v.Finished {
+			return true
+		}
+	}
+	return false
+}
+
+func hasUnfinishedToolCalls(messages []message.Message) bool {
+	toolCalls := make([]message.ToolCall, 0)
+	for _, m := range messages {
+		toolCalls = append(toolCalls, m.ToolCalls()...)
+	}
+	for _, v := range toolCalls {
+		if !v.Finished {
+			return true
+		}
+	}
+	return false
+}
+
+func (m *messagesCmp) working() string {
+	text := ""
+	if m.IsAgentWorking() && len(m.messages) > 0 {
+		t := theme.CurrentTheme()
+		baseStyle := styles.BaseStyle()
+
+		task := "Thinking..."
+		lastMessage := m.messages[len(m.messages)-1]
+		if hasToolsWithoutResponse(m.messages) {
+			task = "Waiting for tool response..."
+		} else if hasUnfinishedToolCalls(m.messages) {
+			task = "Building tool call..."
+		} else if !lastMessage.IsFinished() {
+			task = "Generating..."
+		}
+		if task != "" {
+			text += baseStyle.
+				Width(m.width).
+				Foreground(t.Primary()).
+				Bold(true).
+				Render(fmt.Sprintf("%s %s ", m.spinner.View(), task))
+		}
+	}
+	return text
+}
+
+func (m *messagesCmp) help() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	text := ""
+
+	if m.app.PrimaryAgent.IsBusy() {
+		text += lipgloss.JoinHorizontal(
+			lipgloss.Left,
+			baseStyle.Foreground(t.TextMuted()).Bold(true).Render("press "),
+			baseStyle.Foreground(t.Text()).Bold(true).Render("esc"),
+			baseStyle.Foreground(t.TextMuted()).Bold(true).Render(" to interrupt"),
+		)
+	} else {
+		text += lipgloss.JoinHorizontal(
+			lipgloss.Left,
+			baseStyle.Foreground(t.Text()).Bold(true).Render("enter"),
+			baseStyle.Foreground(t.TextMuted()).Bold(true).Render(" to send,"),
+			baseStyle.Foreground(t.Text()).Bold(true).Render(" \\"),
+			baseStyle.Foreground(t.TextMuted()).Bold(true).Render("+"),
+			baseStyle.Foreground(t.Text()).Bold(true).Render("enter"),
+			baseStyle.Foreground(t.TextMuted()).Bold(true).Render(" for newline,"),
+			baseStyle.Foreground(t.Text()).Bold(true).Render(" ↑↓"),
+			baseStyle.Foreground(t.TextMuted()).Bold(true).Render(" for history,"),
+			baseStyle.Foreground(t.Text()).Bold(true).Render(" ctrl+h"),
+			baseStyle.Foreground(t.TextMuted()).Bold(true).Render(" to toggle tool messages"),
+		)
+	}
+	return baseStyle.
+		Width(m.width).
+		Render(text)
+}
+
+func (m *messagesCmp) initialScreen() string {
+	baseStyle := styles.BaseStyle()
+
+	return baseStyle.Width(m.width).Render(
+		lipgloss.JoinVertical(
+			lipgloss.Top,
+			header(m.width),
+			"",
+			lspsConfigured(m.width),
+		),
+	)
+}
+
+func (m *messagesCmp) rerender() {
+	for _, msg := range m.messages {
+		delete(m.cachedContent, msg.ID)
+	}
+	m.renderView()
+}
+
+func (m *messagesCmp) SetSize(width, height int) tea.Cmd {
+	if m.width == width && m.height == height {
+		return nil
+	}
+	m.width = width
+	m.height = height
+	m.viewport.Width = width
+	m.viewport.Height = height - 2
+	m.attachments.Width = width + 40
+	m.attachments.Height = 3
+	m.rerender()
+	return nil
+}
+
+func (m *messagesCmp) GetSize() (int, int) {
+	return m.width, m.height
+}
+
+func (m *messagesCmp) Reload(session *session.Session) tea.Cmd {
+	messages, err := m.app.Messages.List(context.Background(), session.ID)
+	if err != nil {
+		status.Error(err.Error())
+		return nil
+	}
+	m.messages = messages
+	if len(m.messages) > 0 {
+		m.currentMsgID = m.messages[len(m.messages)-1].ID
+	}
+	delete(m.cachedContent, m.currentMsgID)
+	m.rendering = true
+	return func() tea.Msg {
+		m.renderView()
+		return renderFinishedMsg{}
+	}
+}
+
+func (m *messagesCmp) BindingKeys() []key.Binding {
+	return []key.Binding{
+		m.viewport.KeyMap.PageDown,
+		m.viewport.KeyMap.PageUp,
+		m.viewport.KeyMap.HalfPageUp,
+		m.viewport.KeyMap.HalfPageDown,
+	}
+}
+
+func NewMessagesCmp(app *app.App) tea.Model {
+	customSpinner := spinner.Spinner{
+		Frames: []string{" ", "┃", "┃"},
+		FPS:    time.Second / 3,
+	}
+	s := spinner.New(spinner.WithSpinner(customSpinner))
+	vp := viewport.New(0, 0)
+	attachmets := viewport.New(0, 0)
+	vp.KeyMap.PageUp = messageKeys.PageUp
+	vp.KeyMap.PageDown = messageKeys.PageDown
+	vp.KeyMap.HalfPageUp = messageKeys.HalfPageUp
+	vp.KeyMap.HalfPageDown = messageKeys.HalfPageDown
+	return &messagesCmp{
+		app:              app,
+		cachedContent:    make(map[string]cacheItem),
+		viewport:         vp,
+		spinner:          s,
+		attachments:      attachmets,
+		showToolMessages: true,
+	}
+}

pkg/tui/components/chat/sidebar.go

@@ -0,0 +1,355 @@
+package chat
+
+import (
+	"context"
+	"fmt"
+	"sort"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/diff"
+	"github.com/sst/opencode/internal/history"
+	"github.com/sst/opencode/internal/pubsub"
+	"github.com/sst/opencode/internal/tui/state"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type sidebarCmp struct {
+	app           *app.App
+	width, height int
+	modFiles      map[string]struct {
+		additions int
+		removals  int
+	}
+}
+
+func (m *sidebarCmp) Init() tea.Cmd {
+	if m.app.History != nil {
+		ctx := context.Background()
+		// Subscribe to file events
+		filesCh := m.app.History.Subscribe(ctx)
+
+		// Initialize the modified files map
+		m.modFiles = make(map[string]struct {
+			additions int
+			removals  int
+		})
+
+		// Load initial files and calculate diffs
+		m.loadModifiedFiles(ctx)
+
+		// Return a command that will send file events to the Update method
+		return func() tea.Msg {
+			return <-filesCh
+		}
+	}
+	return nil
+}
+
+func (m *sidebarCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case state.SessionSelectedMsg:
+		ctx := context.Background()
+		m.loadModifiedFiles(ctx)
+	case pubsub.Event[history.File]:
+		if msg.Payload.SessionID == m.app.CurrentSession.ID {
+			// Process the individual file change instead of reloading all files
+			ctx := context.Background()
+			m.processFileChanges(ctx, msg.Payload)
+		}
+	}
+	return m, nil
+}
+
+func (m *sidebarCmp) View() string {
+	baseStyle := styles.BaseStyle()
+
+	return baseStyle.
+		Width(m.width).
+		PaddingLeft(4).
+		PaddingRight(1).
+		Render(
+			lipgloss.JoinVertical(
+				lipgloss.Top,
+				header(m.width),
+				" ",
+				m.sessionSection(),
+				" ",
+				lspsConfigured(m.width),
+				" ",
+				m.modifiedFiles(),
+			),
+		)
+}
+
+func (m *sidebarCmp) sessionSection() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	sessionKey := baseStyle.
+		Foreground(t.Primary()).
+		Bold(true).
+		Render("Session")
+
+	sessionValue := baseStyle.
+		Foreground(t.Text()).
+		Render(fmt.Sprintf(": %s", m.app.CurrentSession.Title))
+
+	return sessionKey + sessionValue
+}
+
+func (m *sidebarCmp) modifiedFile(filePath string, additions, removals int) string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	stats := ""
+	if additions > 0 && removals > 0 {
+		additionsStr := baseStyle.
+			Foreground(t.Success()).
+			PaddingLeft(1).
+			Render(fmt.Sprintf("+%d", additions))
+
+		removalsStr := baseStyle.
+			Foreground(t.Error()).
+			PaddingLeft(1).
+			Render(fmt.Sprintf("-%d", removals))
+
+		content := lipgloss.JoinHorizontal(lipgloss.Left, additionsStr, removalsStr)
+		stats = baseStyle.Width(lipgloss.Width(content)).Render(content)
+	} else if additions > 0 {
+		additionsStr := fmt.Sprintf(" %s", baseStyle.
+			PaddingLeft(1).
+			Foreground(t.Success()).
+			Render(fmt.Sprintf("+%d", additions)))
+		stats = baseStyle.Width(lipgloss.Width(additionsStr)).Render(additionsStr)
+	} else if removals > 0 {
+		removalsStr := fmt.Sprintf(" %s", baseStyle.
+			PaddingLeft(1).
+			Foreground(t.Error()).
+			Render(fmt.Sprintf("-%d", removals)))
+		stats = baseStyle.Width(lipgloss.Width(removalsStr)).Render(removalsStr)
+	}
+
+	filePathStr := baseStyle.Render(filePath)
+
+	return baseStyle.
+		Width(m.width).
+		Render(
+			lipgloss.JoinHorizontal(
+				lipgloss.Left,
+				filePathStr,
+				stats,
+			),
+		)
+}
+
+func (m *sidebarCmp) modifiedFiles() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	modifiedFiles := baseStyle.
+		Width(m.width).
+		Foreground(t.Primary()).
+		Bold(true).
+		Render("Modified Files:")
+
+	// If no modified files, show a placeholder message
+	if m.modFiles == nil || len(m.modFiles) == 0 {
+		message := "No modified files"
+		remainingWidth := m.width - lipgloss.Width(message)
+		if remainingWidth > 0 {
+			message += strings.Repeat(" ", remainingWidth)
+		}
+		return baseStyle.
+			Width(m.width).
+			Render(
+				lipgloss.JoinVertical(
+					lipgloss.Top,
+					modifiedFiles,
+					baseStyle.Foreground(t.TextMuted()).Render(message),
+				),
+			)
+	}
+
+	// Sort file paths alphabetically for consistent ordering
+	var paths []string
+	for path := range m.modFiles {
+		paths = append(paths, path)
+	}
+	sort.Strings(paths)
+
+	// Create views for each file in sorted order
+	var fileViews []string
+	for _, path := range paths {
+		stats := m.modFiles[path]
+		fileViews = append(fileViews, m.modifiedFile(path, stats.additions, stats.removals))
+	}
+
+	return baseStyle.
+		Width(m.width).
+		Render(
+			lipgloss.JoinVertical(
+				lipgloss.Top,
+				modifiedFiles,
+				lipgloss.JoinVertical(
+					lipgloss.Left,
+					fileViews...,
+				),
+			),
+		)
+}
+
+func (m *sidebarCmp) SetSize(width, height int) tea.Cmd {
+	m.width = width
+	m.height = height
+	return nil
+}
+
+func (m *sidebarCmp) GetSize() (int, int) {
+	return m.width, m.height
+}
+
+func NewSidebarCmp(app *app.App) tea.Model {
+	return &sidebarCmp{
+		app: app,
+	}
+}
+
+func (m *sidebarCmp) loadModifiedFiles(ctx context.Context) {
+	if m.app.CurrentSession.ID == "" {
+		return
+	}
+
+	// Get all latest files for this session
+	latestFiles, err := m.app.History.ListLatestSessionFiles(ctx, m.app.CurrentSession.ID)
+	if err != nil {
+		return
+	}
+
+	// Get all files for this session (to find initial versions)
+	allFiles, err := m.app.History.ListBySession(ctx, m.app.CurrentSession.ID)
+	if err != nil {
+		return
+	}
+
+	// Clear the existing map to rebuild it
+	m.modFiles = make(map[string]struct {
+		additions int
+		removals  int
+	})
+
+	// Process each latest file
+	for _, file := range latestFiles {
+		// Skip if this is the initial version (no changes to show)
+		if file.Version == history.InitialVersion {
+			continue
+		}
+
+		// Find the initial version for this specific file
+		var initialVersion history.File
+		for _, v := range allFiles {
+			if v.Path == file.Path && v.Version == history.InitialVersion {
+				initialVersion = v
+				break
+			}
+		}
+
+		// Skip if we can't find the initial version
+		if initialVersion.ID == "" {
+			continue
+		}
+		if initialVersion.Content == file.Content {
+			continue
+		}
+
+		// Calculate diff between initial and latest version
+		_, additions, removals := diff.GenerateDiff(initialVersion.Content, file.Content, file.Path)
+
+		// Only add to modified files if there are changes
+		if additions > 0 || removals > 0 {
+			// Remove working directory prefix from file path
+			displayPath := file.Path
+			workingDir := config.WorkingDirectory()
+			displayPath = strings.TrimPrefix(displayPath, workingDir)
+			displayPath = strings.TrimPrefix(displayPath, "/")
+
+			m.modFiles[displayPath] = struct {
+				additions int
+				removals  int
+			}{
+				additions: additions,
+				removals:  removals,
+			}
+		}
+	}
+}
+
+func (m *sidebarCmp) processFileChanges(ctx context.Context, file history.File) {
+	// Skip if this is the initial version (no changes to show)
+	if file.Version == history.InitialVersion {
+		return
+	}
+
+	// Find the initial version for this file
+	initialVersion, err := m.findInitialVersion(ctx, file.Path)
+	if err != nil || initialVersion.ID == "" {
+		return
+	}
+
+	// Skip if content hasn't changed
+	if initialVersion.Content == file.Content {
+		// If this file was previously modified but now matches the initial version,
+		// remove it from the modified files list
+		displayPath := getDisplayPath(file.Path)
+		delete(m.modFiles, displayPath)
+		return
+	}
+
+	// Calculate diff between initial and latest version
+	_, additions, removals := diff.GenerateDiff(initialVersion.Content, file.Content, file.Path)
+
+	// Only add to modified files if there are changes
+	if additions > 0 || removals > 0 {
+		displayPath := getDisplayPath(file.Path)
+		m.modFiles[displayPath] = struct {
+			additions int
+			removals  int
+		}{
+			additions: additions,
+			removals:  removals,
+		}
+	} else {
+		// If no changes, remove from modified files
+		displayPath := getDisplayPath(file.Path)
+		delete(m.modFiles, displayPath)
+	}
+}
+
+// Helper function to find the initial version of a file
+func (m *sidebarCmp) findInitialVersion(ctx context.Context, path string) (history.File, error) {
+	// Get all versions of this file for the session
+	fileVersions, err := m.app.History.ListBySession(ctx, m.app.CurrentSession.ID)
+	if err != nil {
+		return history.File{}, err
+	}
+
+	// Find the initial version
+	for _, v := range fileVersions {
+		if v.Path == path && v.Version == history.InitialVersion {
+			return v, nil
+		}
+	}
+
+	return history.File{}, fmt.Errorf("initial version not found")
+}
+
+// Helper function to get the display path for a file
+func getDisplayPath(path string) string {
+	workingDir := config.WorkingDirectory()
+	displayPath := strings.TrimPrefix(path, workingDir)
+	return strings.TrimPrefix(displayPath, "/")
+}

pkg/tui/components/core/status.go

@@ -0,0 +1,359 @@
+package core
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/llm/models"
+	"github.com/sst/opencode/internal/lsp"
+	"github.com/sst/opencode/internal/lsp/protocol"
+	"github.com/sst/opencode/internal/pubsub"
+	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type StatusCmp interface {
+	tea.Model
+	SetHelpWidgetMsg(string)
+}
+
+type statusCmp struct {
+	app         *app.App
+	queue       []status.StatusMessage
+	width       int
+	messageTTL  time.Duration
+	activeUntil time.Time
+}
+
+// clearMessageCmd is a command that clears status messages after a timeout
+func (m statusCmp) clearMessageCmd() tea.Cmd {
+	return tea.Tick(time.Second, func(t time.Time) tea.Msg {
+		return statusCleanupMsg{time: t}
+	})
+}
+
+// statusCleanupMsg is a message that triggers cleanup of expired status messages
+type statusCleanupMsg struct {
+	time time.Time
+}
+
+func (m statusCmp) Init() tea.Cmd {
+	return m.clearMessageCmd()
+}
+
+func (m statusCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		return m, nil
+	case pubsub.Event[status.StatusMessage]:
+		if msg.Type == status.EventStatusPublished {
+			// If this is a critical message, move it to the front of the queue
+			if msg.Payload.Critical {
+				// Insert at the front of the queue
+				m.queue = append([]status.StatusMessage{msg.Payload}, m.queue...)
+
+				// Reset active time to show critical message immediately
+				m.activeUntil = time.Time{}
+			} else {
+				// Otherwise, just add it to the queue
+				m.queue = append(m.queue, msg.Payload)
+
+				// If this is the first message and nothing is active, activate it immediately
+				if len(m.queue) == 1 && m.activeUntil.IsZero() {
+					now := time.Now()
+					duration := m.messageTTL
+					if msg.Payload.Duration > 0 {
+						duration = msg.Payload.Duration
+					}
+					m.activeUntil = now.Add(duration)
+				}
+			}
+		}
+	case statusCleanupMsg:
+		now := msg.time
+
+		// If the active message has expired, remove it and activate the next one
+		if !m.activeUntil.IsZero() && m.activeUntil.Before(now) {
+			// Current message expired, remove it if we have one
+			if len(m.queue) > 0 {
+				m.queue = m.queue[1:]
+			}
+			m.activeUntil = time.Time{}
+		}
+
+		// If we have messages in queue but none are active, activate the first one
+		if len(m.queue) > 0 && m.activeUntil.IsZero() {
+			// Use custom duration if specified, otherwise use default
+			duration := m.messageTTL
+			if m.queue[0].Duration > 0 {
+				duration = m.queue[0].Duration
+			}
+			m.activeUntil = now.Add(duration)
+		}
+
+		return m, m.clearMessageCmd()
+	}
+	return m, nil
+}
+
+var helpWidget = ""
+
+// getHelpWidget returns the help widget with current theme colors
+func getHelpWidget(helpText string) string {
+	t := theme.CurrentTheme()
+	if helpText == "" {
+		helpText = "ctrl+? help"
+	}
+
+	return styles.Padded().
+		Background(t.TextMuted()).
+		Foreground(t.BackgroundDarker()).
+		Bold(true).
+		Render(helpText)
+}
+
+func formatTokensAndCost(tokens int64, contextWindow int64, cost float64) string {
+	// Format tokens in human-readable format (e.g., 110K, 1.2M)
+	var formattedTokens string
+	switch {
+	case tokens >= 1_000_000:
+		formattedTokens = fmt.Sprintf("%.1fM", float64(tokens)/1_000_000)
+	case tokens >= 1_000:
+		formattedTokens = fmt.Sprintf("%.1fK", float64(tokens)/1_000)
+	default:
+		formattedTokens = fmt.Sprintf("%d", tokens)
+	}
+
+	// Remove .0 suffix if present
+	if strings.HasSuffix(formattedTokens, ".0K") {
+		formattedTokens = strings.Replace(formattedTokens, ".0K", "K", 1)
+	}
+	if strings.HasSuffix(formattedTokens, ".0M") {
+		formattedTokens = strings.Replace(formattedTokens, ".0M", "M", 1)
+	}
+
+	// Format cost with $ symbol and 2 decimal places
+	formattedCost := fmt.Sprintf("$%.2f", cost)
+
+	percentage := (float64(tokens) / float64(contextWindow)) * 100
+
+	return fmt.Sprintf("Tokens: %s (%d%%), Cost: %s", formattedTokens, int(percentage), formattedCost)
+}
+
+func (m statusCmp) View() string {
+	t := theme.CurrentTheme()
+	modelID := config.Get().Agents[config.AgentPrimary].Model
+	model := models.SupportedModels[modelID]
+
+	// Initialize the help widget
+	status := getHelpWidget("")
+
+	if m.app.CurrentSession.ID != "" {
+		tokens := formatTokensAndCost(m.app.CurrentSession.PromptTokens+m.app.CurrentSession.CompletionTokens, model.ContextWindow, m.app.CurrentSession.Cost)
+		tokensStyle := styles.Padded().
+			Background(t.Text()).
+			Foreground(t.BackgroundSecondary()).
+			Render(tokens)
+		status += tokensStyle
+	}
+
+	diagnostics := styles.Padded().Background(t.BackgroundDarker()).Render(m.projectDiagnostics())
+
+	modelName := m.model()
+
+	statusWidth := max(
+		0,
+		m.width-
+			lipgloss.Width(status)-
+			lipgloss.Width(modelName)-
+			lipgloss.Width(diagnostics),
+	)
+
+	const minInlineWidth = 30
+
+	// Display the first status message if available
+	var statusMessage string
+	if len(m.queue) > 0 {
+		sm := m.queue[0]
+		infoStyle := styles.Padded().
+			Foreground(t.Background())
+
+		switch sm.Level {
+		case "info":
+			infoStyle = infoStyle.Background(t.Info())
+		case "warn":
+			infoStyle = infoStyle.Background(t.Warning())
+		case "error":
+			infoStyle = infoStyle.Background(t.Error())
+		case "debug":
+			infoStyle = infoStyle.Background(t.TextMuted())
+		}
+
+		// Truncate message if it's longer than available width
+		msg := sm.Message
+		availWidth := statusWidth - 10
+
+		// If we have enough space, show inline
+		if availWidth >= minInlineWidth {
+			if len(msg) > availWidth && availWidth > 0 {
+				msg = msg[:availWidth] + "..."
+			}
+			status += infoStyle.Width(statusWidth).Render(msg)
+		} else {
+			// Otherwise, prepare a full-width message to show above
+			if len(msg) > m.width-10 && m.width > 10 {
+				msg = msg[:m.width-10] + "..."
+			}
+			statusMessage = infoStyle.Width(m.width).Render(msg)
+
+			// Add empty space in the status bar
+			status += styles.Padded().
+				Foreground(t.Text()).
+				Background(t.BackgroundSecondary()).
+				Width(statusWidth).
+				Render("")
+		}
+	} else {
+		status += styles.Padded().
+			Foreground(t.Text()).
+			Background(t.BackgroundSecondary()).
+			Width(statusWidth).
+			Render("")
+	}
+
+	status += diagnostics
+	status += modelName
+
+	// If we have a separate status message, prepend it
+	if statusMessage != "" {
+		return statusMessage + "\n" + status
+	} else {
+		blank := styles.BaseStyle().Background(t.Background()).Width(m.width).Render("")
+		return blank + "\n" + status
+	}
+}
+
+func (m *statusCmp) projectDiagnostics() string {
+	t := theme.CurrentTheme()
+
+	// Check if any LSP server is still initializing
+	initializing := false
+	for _, client := range m.app.LSPClients {
+		if client.GetServerState() == lsp.StateStarting {
+			initializing = true
+			break
+		}
+	}
+
+	// If any server is initializing, show that status
+	if initializing {
+		return lipgloss.NewStyle().
+			Foreground(t.Warning()).
+			Render(fmt.Sprintf("%s Initializing LSP...", styles.SpinnerIcon))
+	}
+
+	errorDiagnostics := []protocol.Diagnostic{}
+	warnDiagnostics := []protocol.Diagnostic{}
+	hintDiagnostics := []protocol.Diagnostic{}
+	infoDiagnostics := []protocol.Diagnostic{}
+	for _, client := range m.app.LSPClients {
+		for _, d := range client.GetDiagnostics() {
+			for _, diag := range d {
+				switch diag.Severity {
+				case protocol.SeverityError:
+					errorDiagnostics = append(errorDiagnostics, diag)
+				case protocol.SeverityWarning:
+					warnDiagnostics = append(warnDiagnostics, diag)
+				case protocol.SeverityHint:
+					hintDiagnostics = append(hintDiagnostics, diag)
+				case protocol.SeverityInformation:
+					infoDiagnostics = append(infoDiagnostics, diag)
+				}
+			}
+		}
+	}
+
+	if len(errorDiagnostics) == 0 &&
+		len(warnDiagnostics) == 0 &&
+		len(infoDiagnostics) == 0 &&
+		len(hintDiagnostics) == 0 {
+		return styles.ForceReplaceBackgroundWithLipgloss(
+			styles.Padded().Render("No diagnostics"),
+			t.BackgroundDarker(),
+		)
+	}
+
+	diagnostics := []string{}
+
+	errStr := lipgloss.NewStyle().
+		Background(t.BackgroundDarker()).
+		Foreground(t.Error()).
+		Render(fmt.Sprintf("%s %d", styles.ErrorIcon, len(errorDiagnostics)))
+	diagnostics = append(diagnostics, errStr)
+
+	warnStr := lipgloss.NewStyle().
+		Background(t.BackgroundDarker()).
+		Foreground(t.Warning()).
+		Render(fmt.Sprintf("%s %d", styles.WarningIcon, len(warnDiagnostics)))
+	diagnostics = append(diagnostics, warnStr)
+
+	infoStr := lipgloss.NewStyle().
+		Background(t.BackgroundDarker()).
+		Foreground(t.Info()).
+		Render(fmt.Sprintf("%s %d", styles.InfoIcon, len(infoDiagnostics)))
+	diagnostics = append(diagnostics, infoStr)
+
+	hintStr := lipgloss.NewStyle().
+		Background(t.BackgroundDarker()).
+		Foreground(t.Text()).
+		Render(fmt.Sprintf("%s %d", styles.HintIcon, len(hintDiagnostics)))
+	diagnostics = append(diagnostics, hintStr)
+
+	return styles.ForceReplaceBackgroundWithLipgloss(
+		styles.Padded().Render(strings.Join(diagnostics, " ")),
+		t.BackgroundDarker(),
+	)
+}
+
+func (m statusCmp) model() string {
+	t := theme.CurrentTheme()
+
+	cfg := config.Get()
+
+	coder, ok := cfg.Agents[config.AgentPrimary]
+	if !ok {
+		return "Unknown"
+	}
+	model := models.SupportedModels[coder.Model]
+
+	return styles.Padded().
+		Background(t.Secondary()).
+		Foreground(t.Background()).
+		Render(model.Name)
+}
+
+func (m statusCmp) SetHelpWidgetMsg(s string) {
+	// Update the help widget text using the getHelpWidget function
+	helpWidget = getHelpWidget(s)
+}
+
+func NewStatusCmp(app *app.App) StatusCmp {
+	// Initialize the help widget with default text
+	helpWidget = getHelpWidget("")
+
+	statusComponent := &statusCmp{
+		app:         app,
+		queue:       []status.StatusMessage{},
+		messageTTL:  4 * time.Second,
+		activeUntil: time.Time{},
+	}
+
+	return statusComponent
+}

pkg/tui/components/dialog/arguments.go

@@ -0,0 +1,257 @@
+package dialog
+
+import (
+	"fmt"
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/textinput"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+type argumentsDialogKeyMap struct {
+	Enter  key.Binding
+	Escape key.Binding
+}
+
+// ShortHelp implements key.Map.
+func (k argumentsDialogKeyMap) ShortHelp() []key.Binding {
+	return []key.Binding{
+		key.NewBinding(
+			key.WithKeys("enter"),
+			key.WithHelp("enter", "confirm"),
+		),
+		key.NewBinding(
+			key.WithKeys("esc"),
+			key.WithHelp("esc", "cancel"),
+		),
+	}
+}
+
+// FullHelp implements key.Map.
+func (k argumentsDialogKeyMap) FullHelp() [][]key.Binding {
+	return [][]key.Binding{k.ShortHelp()}
+}
+
+// ShowMultiArgumentsDialogMsg is a message that is sent to show the multi-arguments dialog.
+type ShowMultiArgumentsDialogMsg struct {
+	CommandID string
+	Content   string
+	ArgNames  []string
+}
+
+// CloseMultiArgumentsDialogMsg is a message that is sent when the multi-arguments dialog is closed.
+type CloseMultiArgumentsDialogMsg struct {
+	Submit    bool
+	CommandID string
+	Content   string
+	Args      map[string]string
+}
+
+// MultiArgumentsDialogCmp is a component that asks the user for multiple command arguments.
+type MultiArgumentsDialogCmp struct {
+	width, height int
+	inputs        []textinput.Model
+	focusIndex    int
+	keys          argumentsDialogKeyMap
+	commandID     string
+	content       string
+	argNames      []string
+}
+
+// NewMultiArgumentsDialogCmp creates a new MultiArgumentsDialogCmp.
+func NewMultiArgumentsDialogCmp(commandID, content string, argNames []string) MultiArgumentsDialogCmp {
+	t := theme.CurrentTheme()
+	inputs := make([]textinput.Model, len(argNames))
+
+	for i, name := range argNames {
+		ti := textinput.New()
+		ti.Placeholder = fmt.Sprintf("Enter value for %s...", name)
+		ti.Width = 40
+		ti.Prompt = ""
+		ti.PlaceholderStyle = ti.PlaceholderStyle.Background(t.Background())
+		ti.PromptStyle = ti.PromptStyle.Background(t.Background())
+		ti.TextStyle = ti.TextStyle.Background(t.Background())
+
+		// Only focus the first input initially
+		if i == 0 {
+			ti.Focus()
+			ti.PromptStyle = ti.PromptStyle.Foreground(t.Primary())
+			ti.TextStyle = ti.TextStyle.Foreground(t.Primary())
+		} else {
+			ti.Blur()
+		}
+
+		inputs[i] = ti
+	}
+
+	return MultiArgumentsDialogCmp{
+		inputs:     inputs,
+		keys:       argumentsDialogKeyMap{},
+		commandID:  commandID,
+		content:    content,
+		argNames:   argNames,
+		focusIndex: 0,
+	}
+}
+
+// Init implements tea.Model.
+func (m MultiArgumentsDialogCmp) Init() tea.Cmd {
+	// Make sure only the first input is focused
+	for i := range m.inputs {
+		if i == 0 {
+			m.inputs[i].Focus()
+		} else {
+			m.inputs[i].Blur()
+		}
+	}
+
+	return textinput.Blink
+}
+
+// Update implements tea.Model.
+func (m MultiArgumentsDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	t := theme.CurrentTheme()
+
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, key.NewBinding(key.WithKeys("esc"))):
+			return m, util.CmdHandler(CloseMultiArgumentsDialogMsg{
+				Submit:    false,
+				CommandID: m.commandID,
+				Content:   m.content,
+				Args:      nil,
+			})
+		case key.Matches(msg, key.NewBinding(key.WithKeys("enter"))):
+			// If we're on the last input, submit the form
+			if m.focusIndex == len(m.inputs)-1 {
+				args := make(map[string]string)
+				for i, name := range m.argNames {
+					args[name] = m.inputs[i].Value()
+				}
+				return m, util.CmdHandler(CloseMultiArgumentsDialogMsg{
+					Submit:    true,
+					CommandID: m.commandID,
+					Content:   m.content,
+					Args:      args,
+				})
+			}
+			// Otherwise, move to the next input
+			m.inputs[m.focusIndex].Blur()
+			m.focusIndex++
+			m.inputs[m.focusIndex].Focus()
+			m.inputs[m.focusIndex].PromptStyle = m.inputs[m.focusIndex].PromptStyle.Foreground(t.Primary())
+			m.inputs[m.focusIndex].TextStyle = m.inputs[m.focusIndex].TextStyle.Foreground(t.Primary())
+		case key.Matches(msg, key.NewBinding(key.WithKeys("tab"))):
+			// Move to the next input
+			m.inputs[m.focusIndex].Blur()
+			m.focusIndex = (m.focusIndex + 1) % len(m.inputs)
+			m.inputs[m.focusIndex].Focus()
+			m.inputs[m.focusIndex].PromptStyle = m.inputs[m.focusIndex].PromptStyle.Foreground(t.Primary())
+			m.inputs[m.focusIndex].TextStyle = m.inputs[m.focusIndex].TextStyle.Foreground(t.Primary())
+		case key.Matches(msg, key.NewBinding(key.WithKeys("shift+tab"))):
+			// Move to the previous input
+			m.inputs[m.focusIndex].Blur()
+			m.focusIndex = (m.focusIndex - 1 + len(m.inputs)) % len(m.inputs)
+			m.inputs[m.focusIndex].Focus()
+			m.inputs[m.focusIndex].PromptStyle = m.inputs[m.focusIndex].PromptStyle.Foreground(t.Primary())
+			m.inputs[m.focusIndex].TextStyle = m.inputs[m.focusIndex].TextStyle.Foreground(t.Primary())
+		}
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		m.height = msg.Height
+	}
+
+	// Update the focused input
+	var cmd tea.Cmd
+	m.inputs[m.focusIndex], cmd = m.inputs[m.focusIndex].Update(msg)
+	cmds = append(cmds, cmd)
+
+	return m, tea.Batch(cmds...)
+}
+
+// View implements tea.Model.
+func (m MultiArgumentsDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	// Calculate width needed for content
+	maxWidth := 60 // Width for explanation text
+
+	title := lipgloss.NewStyle().
+		Foreground(t.Primary()).
+		Bold(true).
+		Width(maxWidth).
+		Padding(0, 1).
+		Background(t.Background()).
+		Render("Command Arguments")
+
+	explanation := lipgloss.NewStyle().
+		Foreground(t.Text()).
+		Width(maxWidth).
+		Padding(0, 1).
+		Background(t.Background()).
+		Render("This command requires multiple arguments. Please enter values for each:")
+
+	// Create input fields for each argument
+	inputFields := make([]string, len(m.inputs))
+	for i, input := range m.inputs {
+		// Highlight the label of the focused input
+		labelStyle := lipgloss.NewStyle().
+			Width(maxWidth).
+			Padding(1, 1, 0, 1).
+			Background(t.Background())
+
+		if i == m.focusIndex {
+			labelStyle = labelStyle.Foreground(t.Primary()).Bold(true)
+		} else {
+			labelStyle = labelStyle.Foreground(t.TextMuted())
+		}
+
+		label := labelStyle.Render(m.argNames[i] + ":")
+
+		field := lipgloss.NewStyle().
+			Foreground(t.Text()).
+			Width(maxWidth).
+			Padding(0, 1).
+			Background(t.Background()).
+			Render(input.View())
+
+		inputFields[i] = lipgloss.JoinVertical(lipgloss.Left, label, field)
+	}
+
+	maxWidth = min(maxWidth, m.width-10)
+
+	// Join all elements vertically
+	elements := []string{title, explanation}
+	elements = append(elements, inputFields...)
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		elements...,
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Background(t.Background()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+// SetSize sets the size of the component.
+func (m *MultiArgumentsDialogCmp) SetSize(width, height int) {
+	m.width = width
+	m.height = height
+}
+
+// Bindings implements layout.Bindings.
+func (m MultiArgumentsDialogCmp) Bindings() []key.Binding {
+	return m.keys.ShortHelp()
+}

pkg/tui/components/dialog/commands.go

@@ -0,0 +1,180 @@
+package dialog
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	utilComponents "github.com/sst/opencode/internal/tui/components/util"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+// Command represents a command that can be executed
+type Command struct {
+	ID          string
+	Title       string
+	Description string
+	Handler     func(cmd Command) tea.Cmd
+}
+
+func (ci Command) Render(selected bool, width int) string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	descStyle := baseStyle.Width(width).Foreground(t.TextMuted())
+	itemStyle := baseStyle.Width(width).
+		Foreground(t.Text()).
+		Background(t.Background())
+
+	if selected {
+		itemStyle = itemStyle.
+			Background(t.Primary()).
+			Foreground(t.Background()).
+			Bold(true)
+		descStyle = descStyle.
+			Background(t.Primary()).
+			Foreground(t.Background())
+	}
+
+	title := itemStyle.Padding(0, 1).Render(ci.Title)
+	if ci.Description != "" {
+		description := descStyle.Padding(0, 1).Render(ci.Description)
+		return lipgloss.JoinVertical(lipgloss.Left, title, description)
+	}
+	return title
+}
+
+// CommandSelectedMsg is sent when a command is selected
+type CommandSelectedMsg struct {
+	Command Command
+}
+
+// CloseCommandDialogMsg is sent when the command dialog is closed
+type CloseCommandDialogMsg struct{}
+
+// CommandDialog interface for the command selection dialog
+type CommandDialog interface {
+	tea.Model
+	layout.Bindings
+	SetCommands(commands []Command)
+}
+
+type commandDialogCmp struct {
+	listView utilComponents.SimpleList[Command]
+	width    int
+	height   int
+}
+
+type commandKeyMap struct {
+	Enter  key.Binding
+	Escape key.Binding
+}
+
+var commandKeys = commandKeyMap{
+	Enter: key.NewBinding(
+		key.WithKeys("enter"),
+		key.WithHelp("enter", "select command"),
+	),
+	Escape: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "close"),
+	),
+}
+
+func (c *commandDialogCmp) Init() tea.Cmd {
+	return c.listView.Init()
+}
+
+func (c *commandDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, commandKeys.Enter):
+			selectedItem, idx := c.listView.GetSelectedItem()
+			if idx != -1 {
+				return c, util.CmdHandler(CommandSelectedMsg{
+					Command: selectedItem,
+				})
+			}
+		case key.Matches(msg, commandKeys.Escape):
+			return c, util.CmdHandler(CloseCommandDialogMsg{})
+		}
+	case tea.WindowSizeMsg:
+		c.width = msg.Width
+		c.height = msg.Height
+	}
+
+	u, cmd := c.listView.Update(msg)
+	c.listView = u.(utilComponents.SimpleList[Command])
+	cmds = append(cmds, cmd)
+
+	return c, tea.Batch(cmds...)
+}
+
+func (c *commandDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	maxWidth := 40
+
+	commands := c.listView.GetItems()
+
+	for _, cmd := range commands {
+		if len(cmd.Title) > maxWidth-4 {
+			maxWidth = len(cmd.Title) + 4
+		}
+		if cmd.Description != "" {
+			if len(cmd.Description) > maxWidth-4 {
+				maxWidth = len(cmd.Description) + 4
+			}
+		}
+	}
+
+	c.listView.SetMaxWidth(maxWidth)
+
+	title := baseStyle.
+		Foreground(t.Primary()).
+		Bold(true).
+		Width(maxWidth).
+		Padding(0, 1).
+		Render("Commands")
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		title,
+		baseStyle.Width(maxWidth).Render(""),
+		baseStyle.Width(maxWidth).Render(c.listView.View()),
+		baseStyle.Width(maxWidth).Render(""),
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+func (c *commandDialogCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(commandKeys)
+}
+
+func (c *commandDialogCmp) SetCommands(commands []Command) {
+	c.listView.SetItems(commands)
+}
+
+// NewCommandDialogCmp creates a new command selection dialog
+func NewCommandDialogCmp() CommandDialog {
+	listView := utilComponents.NewSimpleList[Command](
+		[]Command{},
+		10,
+		"No commands available",
+		true,
+	)
+	return &commandDialogCmp{
+		listView: listView,
+	}
+}

pkg/tui/components/dialog/complete.go

@@ -0,0 +1,263 @@
+package dialog
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/textarea"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/status"
+	utilComponents "github.com/sst/opencode/internal/tui/components/util"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+type CompletionItem struct {
+	title string
+	Title string
+	Value string
+}
+
+type CompletionItemI interface {
+	utilComponents.SimpleListItem
+	GetValue() string
+	DisplayValue() string
+}
+
+func (ci *CompletionItem) Render(selected bool, width int) string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	itemStyle := baseStyle.
+		Width(width).
+		Padding(0, 1)
+
+	if selected {
+		itemStyle = itemStyle.
+			Background(t.Background()).
+			Foreground(t.Primary()).
+			Bold(true)
+	}
+
+	title := itemStyle.Render(
+		ci.GetValue(),
+	)
+
+	return title
+}
+
+func (ci *CompletionItem) DisplayValue() string {
+	return ci.Title
+}
+
+func (ci *CompletionItem) GetValue() string {
+	return ci.Value
+}
+
+func NewCompletionItem(completionItem CompletionItem) CompletionItemI {
+	return &completionItem
+}
+
+type CompletionProvider interface {
+	GetId() string
+	GetEntry() CompletionItemI
+	GetChildEntries(query string) ([]CompletionItemI, error)
+}
+
+type CompletionSelectedMsg struct {
+	SearchString    string
+	CompletionValue string
+}
+
+type CompletionDialogCompleteItemMsg struct {
+	Value string
+}
+
+type CompletionDialogCloseMsg struct{}
+
+type CompletionDialog interface {
+	tea.Model
+	layout.Bindings
+	SetWidth(width int)
+}
+
+type completionDialogCmp struct {
+	query                string
+	completionProvider   CompletionProvider
+	width                int
+	height               int
+	pseudoSearchTextArea textarea.Model
+	listView             utilComponents.SimpleList[CompletionItemI]
+}
+
+type completionDialogKeyMap struct {
+	Complete key.Binding
+	Cancel   key.Binding
+}
+
+var completionDialogKeys = completionDialogKeyMap{
+	Complete: key.NewBinding(
+		key.WithKeys("tab", "enter"),
+	),
+	Cancel: key.NewBinding(
+		key.WithKeys(" ", "esc", "backspace"),
+	),
+}
+
+func (c *completionDialogCmp) Init() tea.Cmd {
+	return nil
+}
+
+func (c *completionDialogCmp) complete(item CompletionItemI) tea.Cmd {
+	value := c.pseudoSearchTextArea.Value()
+
+	if value == "" {
+		return nil
+	}
+
+	return tea.Batch(
+		util.CmdHandler(CompletionSelectedMsg{
+			SearchString:    value,
+			CompletionValue: item.GetValue(),
+		}),
+		c.close(),
+	)
+}
+
+func (c *completionDialogCmp) close() tea.Cmd {
+	c.listView.SetItems([]CompletionItemI{})
+	c.pseudoSearchTextArea.Reset()
+	c.pseudoSearchTextArea.Blur()
+
+	return util.CmdHandler(CompletionDialogCloseMsg{})
+}
+
+func (c *completionDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		if c.pseudoSearchTextArea.Focused() {
+
+			if !key.Matches(msg, completionDialogKeys.Complete) {
+
+				var cmd tea.Cmd
+				c.pseudoSearchTextArea, cmd = c.pseudoSearchTextArea.Update(msg)
+				cmds = append(cmds, cmd)
+
+				var query string
+				query = c.pseudoSearchTextArea.Value()
+				if query != "" {
+					query = query[1:]
+				}
+
+				if query != c.query {
+					items, err := c.completionProvider.GetChildEntries(query)
+					if err != nil {
+						status.Error(err.Error())
+					}
+
+					c.listView.SetItems(items)
+					c.query = query
+				}
+
+				u, cmd := c.listView.Update(msg)
+				c.listView = u.(utilComponents.SimpleList[CompletionItemI])
+
+				cmds = append(cmds, cmd)
+			}
+
+			switch {
+			case key.Matches(msg, completionDialogKeys.Complete):
+				item, i := c.listView.GetSelectedItem()
+				if i == -1 {
+					return c, nil
+				}
+
+				cmd := c.complete(item)
+
+				return c, cmd
+			case key.Matches(msg, completionDialogKeys.Cancel):
+				// Only close on backspace when there are no characters left
+				if msg.String() != "backspace" || len(c.pseudoSearchTextArea.Value()) <= 0 {
+					return c, c.close()
+				}
+			}
+
+			return c, tea.Batch(cmds...)
+		} else {
+			items, err := c.completionProvider.GetChildEntries("")
+			if err != nil {
+				status.Error(err.Error())
+			}
+
+			c.listView.SetItems(items)
+			c.pseudoSearchTextArea.SetValue(msg.String())
+			return c, c.pseudoSearchTextArea.Focus()
+		}
+	case tea.WindowSizeMsg:
+		c.width = msg.Width
+		c.height = msg.Height
+	}
+
+	return c, tea.Batch(cmds...)
+}
+
+func (c *completionDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	maxWidth := 40
+
+	completions := c.listView.GetItems()
+
+	for _, cmd := range completions {
+		title := cmd.DisplayValue()
+		if len(title) > maxWidth-4 {
+			maxWidth = len(title) + 4
+		}
+	}
+
+	c.listView.SetMaxWidth(maxWidth)
+
+	return baseStyle.Padding(0, 0).
+		Border(lipgloss.NormalBorder()).
+		BorderBottom(false).
+		BorderRight(false).
+		BorderLeft(false).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(c.width).
+		Render(c.listView.View())
+}
+
+func (c *completionDialogCmp) SetWidth(width int) {
+	c.width = width
+}
+
+func (c *completionDialogCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(completionDialogKeys)
+}
+
+func NewCompletionDialogCmp(completionProvider CompletionProvider) CompletionDialog {
+	ti := textarea.New()
+
+	items, err := completionProvider.GetChildEntries("")
+	if err != nil {
+		status.Error(err.Error())
+	}
+
+	li := utilComponents.NewSimpleList(
+		items,
+		7,
+		"No file matches found",
+		false,
+	)
+
+	return &completionDialogCmp{
+		query:                "",
+		completionProvider:   completionProvider,
+		pseudoSearchTextArea: ti,
+		listView:             li,
+	}
+}

pkg/tui/components/dialog/custom_commands.go

@@ -0,0 +1,186 @@
+package dialog
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+// Command prefix constants
+const (
+	UserCommandPrefix    = "user:"
+	ProjectCommandPrefix = "project:"
+)
+
+// namedArgPattern is a regex pattern to find named arguments in the format $NAME
+var namedArgPattern = regexp.MustCompile(`\$([A-Z][A-Z0-9_]*)`)
+
+// LoadCustomCommands loads custom commands from both XDG_CONFIG_HOME and project data directory
+func LoadCustomCommands() ([]Command, error) {
+	cfg := config.Get()
+	if cfg == nil {
+		return nil, fmt.Errorf("config not loaded")
+	}
+
+	var commands []Command
+
+	// Load user commands from XDG_CONFIG_HOME/opencode/commands
+	xdgConfigHome := os.Getenv("XDG_CONFIG_HOME")
+	if xdgConfigHome == "" {
+		// Default to ~/.config if XDG_CONFIG_HOME is not set
+		home, err := os.UserHomeDir()
+		if err == nil {
+			xdgConfigHome = filepath.Join(home, ".config")
+		}
+	}
+
+	if xdgConfigHome != "" {
+		userCommandsDir := filepath.Join(xdgConfigHome, "opencode", "commands")
+		userCommands, err := loadCommandsFromDir(userCommandsDir, UserCommandPrefix)
+		if err != nil {
+			// Log error but continue - we'll still try to load other commands
+			fmt.Printf("Warning: failed to load user commands from XDG_CONFIG_HOME: %v\n", err)
+		} else {
+			commands = append(commands, userCommands...)
+		}
+	}
+
+	// Load commands from $HOME/.opencode/commands
+	home, err := os.UserHomeDir()
+	if err == nil {
+		homeCommandsDir := filepath.Join(home, ".opencode", "commands")
+		homeCommands, err := loadCommandsFromDir(homeCommandsDir, UserCommandPrefix)
+		if err != nil {
+			// Log error but continue - we'll still try to load other commands
+			fmt.Printf("Warning: failed to load home commands: %v\n", err)
+		} else {
+			commands = append(commands, homeCommands...)
+		}
+	}
+
+	// Load project commands from data directory
+	projectCommandsDir := filepath.Join(cfg.Data.Directory, "commands")
+	projectCommands, err := loadCommandsFromDir(projectCommandsDir, ProjectCommandPrefix)
+	if err != nil {
+		// Log error but return what we have so far
+		fmt.Printf("Warning: failed to load project commands: %v\n", err)
+	} else {
+		commands = append(commands, projectCommands...)
+	}
+
+	return commands, nil
+}
+
+// loadCommandsFromDir loads commands from a specific directory with the given prefix
+func loadCommandsFromDir(commandsDir string, prefix string) ([]Command, error) {
+	// Check if the commands directory exists
+	if _, err := os.Stat(commandsDir); os.IsNotExist(err) {
+		// Create the commands directory if it doesn't exist
+		if err := os.MkdirAll(commandsDir, 0755); err != nil {
+			return nil, fmt.Errorf("failed to create commands directory %s: %w", commandsDir, err)
+		}
+		// Return empty list since we just created the directory
+		return []Command{}, nil
+	}
+
+	var commands []Command
+
+	// Walk through the commands directory and load all .md files
+	err := filepath.Walk(commandsDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		// Skip directories
+		if info.IsDir() {
+			return nil
+		}
+
+		// Only process markdown files
+		if !strings.HasSuffix(strings.ToLower(info.Name()), ".md") {
+			return nil
+		}
+
+		// Read the file content
+		content, err := os.ReadFile(path)
+		if err != nil {
+			return fmt.Errorf("failed to read command file %s: %w", path, err)
+		}
+
+		// Get the command ID from the file name without the .md extension
+		commandID := strings.TrimSuffix(info.Name(), filepath.Ext(info.Name()))
+
+		// Get relative path from commands directory
+		relPath, err := filepath.Rel(commandsDir, path)
+		if err != nil {
+			return fmt.Errorf("failed to get relative path for %s: %w", path, err)
+		}
+
+		// Create the command ID from the relative path
+		// Replace directory separators with colons
+		commandIDPath := strings.ReplaceAll(filepath.Dir(relPath), string(filepath.Separator), ":")
+		if commandIDPath != "." {
+			commandID = commandIDPath + ":" + commandID
+		}
+
+		// Create a command
+		command := Command{
+			ID:          prefix + commandID,
+			Title:       prefix + commandID,
+			Description: fmt.Sprintf("Custom command from %s", relPath),
+			Handler: func(cmd Command) tea.Cmd {
+				commandContent := string(content)
+
+				// Check for named arguments
+				matches := namedArgPattern.FindAllStringSubmatch(commandContent, -1)
+				if len(matches) > 0 {
+					// Extract unique argument names
+					argNames := make([]string, 0)
+					argMap := make(map[string]bool)
+
+					for _, match := range matches {
+						argName := match[1] // Group 1 is the name without $
+						if !argMap[argName] {
+							argMap[argName] = true
+							argNames = append(argNames, argName)
+						}
+					}
+
+					// Show multi-arguments dialog for all named arguments
+					return util.CmdHandler(ShowMultiArgumentsDialogMsg{
+						CommandID: cmd.ID,
+						Content:   commandContent,
+						ArgNames:  argNames,
+					})
+				}
+
+				// No arguments needed, run command directly
+				return util.CmdHandler(CommandRunCustomMsg{
+					Content: commandContent,
+					Args:    nil, // No arguments
+				})
+			},
+		}
+
+		commands = append(commands, command)
+		return nil
+	})
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to load custom commands from %s: %w", commandsDir, err)
+	}
+
+	return commands, nil
+}
+
+// CommandRunCustomMsg is sent when a custom command is executed
+type CommandRunCustomMsg struct {
+	Content string
+	Args    map[string]string // Map of argument names to values
+}

pkg/tui/components/dialog/custom_commands_test.go

@@ -0,0 +1,106 @@
+package dialog
+
+import (
+	"testing"
+	"regexp"
+)
+
+func TestNamedArgPattern(t *testing.T) {
+	testCases := []struct {
+		input    string
+		expected []string
+	}{
+		{
+			input:    "This is a test with $ARGUMENTS placeholder",
+			expected: []string{"ARGUMENTS"},
+		},
+		{
+			input:    "This is a test with $FOO and $BAR placeholders",
+			expected: []string{"FOO", "BAR"},
+		},
+		{
+			input:    "This is a test with $FOO_BAR and $BAZ123 placeholders",
+			expected: []string{"FOO_BAR", "BAZ123"},
+		},
+		{
+			input:    "This is a test with no placeholders",
+			expected: []string{},
+		},
+		{
+			input:    "This is a test with $FOO appearing twice: $FOO",
+			expected: []string{"FOO"},
+		},
+		{
+			input:    "This is a test with $1INVALID placeholder",
+			expected: []string{},
+		},
+	}
+
+	for _, tc := range testCases {
+		matches := namedArgPattern.FindAllStringSubmatch(tc.input, -1)
+		
+		// Extract unique argument names
+		argNames := make([]string, 0)
+		argMap := make(map[string]bool)
+		
+		for _, match := range matches {
+			argName := match[1] // Group 1 is the name without $
+			if !argMap[argName] {
+				argMap[argName] = true
+				argNames = append(argNames, argName)
+			}
+		}
+		
+		// Check if we got the expected number of arguments
+		if len(argNames) != len(tc.expected) {
+			t.Errorf("Expected %d arguments, got %d for input: %s", len(tc.expected), len(argNames), tc.input)
+			continue
+		}
+		
+		// Check if we got the expected argument names
+		for _, expectedArg := range tc.expected {
+			found := false
+			for _, actualArg := range argNames {
+				if actualArg == expectedArg {
+					found = true
+					break
+				}
+			}
+			if !found {
+				t.Errorf("Expected argument %s not found in %v for input: %s", expectedArg, argNames, tc.input)
+			}
+		}
+	}
+}
+
+func TestRegexPattern(t *testing.T) {
+	pattern := regexp.MustCompile(`\$([A-Z][A-Z0-9_]*)`)
+	
+	validMatches := []string{
+		"$FOO",
+		"$BAR",
+		"$FOO_BAR",
+		"$BAZ123",
+		"$ARGUMENTS",
+	}
+	
+	invalidMatches := []string{
+		"$foo",
+		"$1BAR",
+		"$_FOO",
+		"FOO",
+		"$",
+	}
+	
+	for _, valid := range validMatches {
+		if !pattern.MatchString(valid) {
+			t.Errorf("Expected %s to match, but it didn't", valid)
+		}
+	}
+	
+	for _, invalid := range invalidMatches {
+		if pattern.MatchString(invalid) {
+			t.Errorf("Expected %s not to match, but it did", invalid)
+		}
+	}
+}

pkg/tui/components/dialog/filepicker.go

@@ -0,0 +1,487 @@
+package dialog
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	"log/slog"
+
+	"github.com/atotto/clipboard"
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/textinput"
+	"github.com/charmbracelet/bubbles/viewport"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/message"
+	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/tui/image"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+const (
+	maxAttachmentSize = int64(5 * 1024 * 1024) // 5MB
+	downArrow         = "down"
+	upArrow           = "up"
+)
+
+type FilePrickerKeyMap struct {
+	Enter          key.Binding
+	Down           key.Binding
+	Up             key.Binding
+	Forward        key.Binding
+	Backward       key.Binding
+	OpenFilePicker key.Binding
+	Esc            key.Binding
+	InsertCWD      key.Binding
+	Paste 		   key.Binding
+}
+
+var filePickerKeyMap = FilePrickerKeyMap{
+	Enter: key.NewBinding(
+		key.WithKeys("enter"),
+		key.WithHelp("enter", "select file/enter directory"),
+	),
+	Down: key.NewBinding(
+		key.WithKeys("j", downArrow),
+		key.WithHelp("↓/j", "down"),
+	),
+	Up: key.NewBinding(
+		key.WithKeys("k", upArrow),
+		key.WithHelp("↑/k", "up"),
+	),
+	Forward: key.NewBinding(
+		key.WithKeys("l"),
+		key.WithHelp("l", "enter directory"),
+	),
+	Backward: key.NewBinding(
+		key.WithKeys("h", "backspace"),
+		key.WithHelp("h/backspace", "go back"),
+	),
+	OpenFilePicker: key.NewBinding(
+		key.WithKeys("ctrl+f"),
+		key.WithHelp("ctrl+f", "open file picker"),
+	),
+	Esc: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "close/exit"),
+	),
+	InsertCWD: key.NewBinding(
+		key.WithKeys("i"),
+		key.WithHelp("i", "manual path input"),
+	),
+	Paste: key.NewBinding(
+		key.WithKeys("ctrl+v"),
+		key.WithHelp("ctrl+v", "paste file/directory path"),
+	),
+}
+
+type filepickerCmp struct {
+	basePath       string
+	width          int
+	height         int
+	cursor         int
+	err            error
+	cursorChain    stack
+	viewport       viewport.Model
+	dirs           []os.DirEntry
+	cwdDetails     *DirNode
+	selectedFile   string
+	cwd            textinput.Model
+	ShowFilePicker bool
+	app            *app.App
+}
+
+type DirNode struct {
+	parent    *DirNode
+	child     *DirNode
+	directory string
+}
+type stack []int
+
+func (s stack) Push(v int) stack {
+	return append(s, v)
+}
+
+func (s stack) Pop() (stack, int) {
+	l := len(s)
+	return s[:l-1], s[l-1]
+}
+
+type AttachmentAddedMsg struct {
+	Attachment message.Attachment
+}
+
+func (f *filepickerCmp) Init() tea.Cmd {
+	return nil
+}
+
+func (f *filepickerCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmd tea.Cmd
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		f.width = 60
+		f.height = 20
+		f.viewport.Width = 80
+		f.viewport.Height = 22
+		f.cursor = 0
+		f.getCurrentFileBelowCursor()
+	case tea.KeyMsg:
+		if f.cwd.Focused() {
+			f.cwd, cmd = f.cwd.Update(msg)
+		}
+		switch {
+		case key.Matches(msg, filePickerKeyMap.InsertCWD):
+			f.cwd.Focus()
+			return f, cmd
+		case key.Matches(msg, filePickerKeyMap.Esc):
+			if f.cwd.Focused() {
+				f.cwd.Blur()
+			}
+		case key.Matches(msg, filePickerKeyMap.Down):
+			if !f.cwd.Focused() || msg.String() == downArrow {
+				if f.cursor < len(f.dirs)-1 {
+					f.cursor++
+					f.getCurrentFileBelowCursor()
+				}
+			}
+		case key.Matches(msg, filePickerKeyMap.Up):
+			if !f.cwd.Focused() || msg.String() == upArrow {
+				if f.cursor > 0 {
+					f.cursor--
+					f.getCurrentFileBelowCursor()
+				}
+			}
+		case key.Matches(msg, filePickerKeyMap.Enter):
+			var path string
+			var isPathDir bool
+			if f.cwd.Focused() {
+				path = f.cwd.Value()
+				fileInfo, err := os.Stat(path)
+				if err != nil {
+					status.Error("Invalid path")
+					return f, cmd
+				}
+				isPathDir = fileInfo.IsDir()
+			} else {
+				path = filepath.Join(f.cwdDetails.directory, "/", f.dirs[f.cursor].Name())
+				isPathDir = f.dirs[f.cursor].IsDir()
+			}
+			if isPathDir {
+				newWorkingDir := DirNode{parent: f.cwdDetails, directory: path}
+				f.cwdDetails.child = &newWorkingDir
+				f.cwdDetails = f.cwdDetails.child
+				f.cursorChain = f.cursorChain.Push(f.cursor)
+				f.dirs = readDir(f.cwdDetails.directory, false)
+				f.cursor = 0
+				f.cwd.SetValue(f.cwdDetails.directory)
+				f.getCurrentFileBelowCursor()
+			} else {
+				f.selectedFile = path
+				return f.addAttachmentToMessage()
+			}
+		case key.Matches(msg, filePickerKeyMap.Esc):
+			if !f.cwd.Focused() {
+				f.cursorChain = make(stack, 0)
+				f.cursor = 0
+			} else {
+				f.cwd.Blur()
+			}
+		case key.Matches(msg, filePickerKeyMap.Forward):
+			if !f.cwd.Focused() {
+				if f.dirs[f.cursor].IsDir() {
+					path := filepath.Join(f.cwdDetails.directory, "/", f.dirs[f.cursor].Name())
+					newWorkingDir := DirNode{parent: f.cwdDetails, directory: path}
+					f.cwdDetails.child = &newWorkingDir
+					f.cwdDetails = f.cwdDetails.child
+					f.cursorChain = f.cursorChain.Push(f.cursor)
+					f.dirs = readDir(f.cwdDetails.directory, false)
+					f.cursor = 0
+					f.cwd.SetValue(f.cwdDetails.directory)
+					f.getCurrentFileBelowCursor()
+				}
+			}
+		case key.Matches(msg, filePickerKeyMap.Backward):
+			if !f.cwd.Focused() {
+				if len(f.cursorChain) != 0 && f.cwdDetails.parent != nil {
+					f.cursorChain, f.cursor = f.cursorChain.Pop()
+					f.cwdDetails = f.cwdDetails.parent
+					f.cwdDetails.child = nil
+					f.dirs = readDir(f.cwdDetails.directory, false)
+					f.cwd.SetValue(f.cwdDetails.directory)
+					f.getCurrentFileBelowCursor()
+				}
+			}
+		case key.Matches(msg, filePickerKeyMap.Paste):
+			if f.cwd.Focused() {
+				val, err := clipboard.ReadAll()
+				if err != nil {
+					slog.Error("failed to read clipboard")
+					return f, cmd
+				}
+				f.cwd.SetValue(f.cwd.Value() + val)
+			}
+		case key.Matches(msg, filePickerKeyMap.OpenFilePicker):
+			f.dirs = readDir(f.cwdDetails.directory, false)
+			f.cursor = 0
+			f.getCurrentFileBelowCursor()
+		}
+	}
+	return f, cmd
+}
+
+func (f *filepickerCmp) addAttachmentToMessage() (tea.Model, tea.Cmd) {
+	modeInfo := GetSelectedModel(config.Get())
+	if !modeInfo.SupportsAttachments {
+		status.Error(fmt.Sprintf("Model %s doesn't support attachments", modeInfo.Name))
+		return f, nil
+	}
+
+	selectedFilePath := f.selectedFile
+	if !isExtSupported(selectedFilePath) {
+		status.Error("Unsupported file")
+		return f, nil
+	}
+
+	isFileLarge, err := image.ValidateFileSize(selectedFilePath, maxAttachmentSize)
+	if err != nil {
+		status.Error("unable to read the image")
+		return f, nil
+	}
+	if isFileLarge {
+		status.Error("file too large, max 5MB")
+		return f, nil
+	}
+
+	content, err := os.ReadFile(selectedFilePath)
+	if err != nil {
+		status.Error("Unable read selected file")
+		return f, nil
+	}
+
+	mimeBufferSize := min(512, len(content))
+	mimeType := http.DetectContentType(content[:mimeBufferSize])
+	fileName := filepath.Base(selectedFilePath)
+	attachment := message.Attachment{FilePath: selectedFilePath, FileName: fileName, MimeType: mimeType, Content: content}
+	f.selectedFile = ""
+	return f, util.CmdHandler(AttachmentAddedMsg{attachment})
+}
+
+func (f *filepickerCmp) View() string {
+	t := theme.CurrentTheme()
+	const maxVisibleDirs = 20
+	const maxWidth = 80
+
+	adjustedWidth := maxWidth
+	for _, file := range f.dirs {
+		if len(file.Name()) > adjustedWidth-4 { // Account for padding
+			adjustedWidth = len(file.Name()) + 4
+		}
+	}
+	adjustedWidth = max(30, min(adjustedWidth, f.width-15)) + 1
+
+	files := make([]string, 0, maxVisibleDirs)
+	startIdx := 0
+
+	if len(f.dirs) > maxVisibleDirs {
+		halfVisible := maxVisibleDirs / 2
+		if f.cursor >= halfVisible && f.cursor < len(f.dirs)-halfVisible {
+			startIdx = f.cursor - halfVisible
+		} else if f.cursor >= len(f.dirs)-halfVisible {
+			startIdx = len(f.dirs) - maxVisibleDirs
+		}
+	}
+
+	endIdx := min(startIdx+maxVisibleDirs, len(f.dirs))
+
+	for i := startIdx; i < endIdx; i++ {
+		file := f.dirs[i]
+		itemStyle := styles.BaseStyle().Width(adjustedWidth)
+
+		if i == f.cursor {
+			itemStyle = itemStyle.
+				Background(t.Primary()).
+				Foreground(t.Background()).
+				Bold(true)
+		}
+		filename := file.Name()
+
+		if len(filename) > adjustedWidth-4 {
+			filename = filename[:adjustedWidth-7] + "..."
+		}
+		if file.IsDir() {
+			filename = filename + "/"
+		}
+
+		files = append(files, itemStyle.Padding(0, 1).Render(filename))
+	}
+
+	// Pad to always show exactly 21 lines
+	for len(files) < maxVisibleDirs {
+		files = append(files, styles.BaseStyle().Width(adjustedWidth).Render(""))
+	}
+
+	currentPath := styles.BaseStyle().
+		Height(1).
+		Width(adjustedWidth).
+		Render(f.cwd.View())
+
+	viewportstyle := lipgloss.NewStyle().
+		Width(f.viewport.Width).
+		Background(t.Background()).
+		Border(lipgloss.RoundedBorder()).
+		BorderForeground(t.TextMuted()).
+		BorderBackground(t.Background()).
+		Padding(2).
+		Render(f.viewport.View())
+	var insertExitText string
+	if f.IsCWDFocused() {
+		insertExitText = "Press esc to exit typing path"
+	} else {
+		insertExitText = "Press i to start typing path"
+	}
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		currentPath,
+		styles.BaseStyle().Width(adjustedWidth).Render(""),
+		styles.BaseStyle().Width(adjustedWidth).Render(lipgloss.JoinVertical(lipgloss.Left, files...)),
+		styles.BaseStyle().Width(adjustedWidth).Render(""),
+		styles.BaseStyle().Foreground(t.TextMuted()).Width(adjustedWidth).Render(insertExitText),
+	)
+
+	f.cwd.SetValue(f.cwd.Value())
+	contentStyle := styles.BaseStyle().Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(lipgloss.Width(content) + 4)
+
+	return lipgloss.JoinHorizontal(lipgloss.Center, contentStyle.Render(content), viewportstyle)
+}
+
+type FilepickerCmp interface {
+	tea.Model
+	ToggleFilepicker(showFilepicker bool)
+	IsCWDFocused() bool
+}
+
+func (f *filepickerCmp) ToggleFilepicker(showFilepicker bool) {
+	f.ShowFilePicker = showFilepicker
+}
+
+func (f *filepickerCmp) IsCWDFocused() bool {
+	return f.cwd.Focused()
+}
+
+func NewFilepickerCmp(app *app.App) FilepickerCmp {
+	homepath, err := os.UserHomeDir()
+	if err != nil {
+		slog.Error("error loading user files")
+		return nil
+	}
+	baseDir := DirNode{parent: nil, directory: homepath}
+	dirs := readDir(homepath, false)
+	viewport := viewport.New(0, 0)
+	currentDirectory := textinput.New()
+	currentDirectory.CharLimit = 200
+	currentDirectory.Width = 44
+	currentDirectory.Cursor.Blink = true
+	currentDirectory.SetValue(baseDir.directory)
+	return &filepickerCmp{cwdDetails: &baseDir, dirs: dirs, cursorChain: make(stack, 0), viewport: viewport, cwd: currentDirectory, app: app}
+}
+
+func (f *filepickerCmp) getCurrentFileBelowCursor() {
+	if len(f.dirs) == 0 || f.cursor < 0 || f.cursor >= len(f.dirs) {
+		slog.Error(fmt.Sprintf("Invalid cursor position. Dirs length: %d, Cursor: %d", len(f.dirs), f.cursor))
+		f.viewport.SetContent("Preview unavailable")
+		return
+	}
+
+	dir := f.dirs[f.cursor]
+	filename := dir.Name()
+	if !dir.IsDir() && isExtSupported(filename) {
+		fullPath := f.cwdDetails.directory + "/" + dir.Name()
+
+		go func() {
+			imageString, err := image.ImagePreview(f.viewport.Width-4, fullPath)
+			if err != nil {
+				slog.Error(err.Error())
+				f.viewport.SetContent("Preview unavailable")
+				return
+			}
+
+			f.viewport.SetContent(imageString)
+		}()
+	} else {
+		f.viewport.SetContent("Preview unavailable")
+	}
+}
+
+func readDir(path string, showHidden bool) []os.DirEntry {
+	slog.Info(fmt.Sprintf("Reading directory: %s", path))
+
+	entriesChan := make(chan []os.DirEntry, 1)
+	errChan := make(chan error, 1)
+
+	go func() {
+		dirEntries, err := os.ReadDir(path)
+		if err != nil {
+			status.Error(err.Error())
+			errChan <- err
+			return
+		}
+		entriesChan <- dirEntries
+	}()
+
+	select {
+	case dirEntries := <-entriesChan:
+		sort.Slice(dirEntries, func(i, j int) bool {
+			if dirEntries[i].IsDir() == dirEntries[j].IsDir() {
+				return dirEntries[i].Name() < dirEntries[j].Name()
+			}
+			return dirEntries[i].IsDir()
+		})
+
+		if showHidden {
+			return dirEntries
+		}
+
+		var sanitizedDirEntries []os.DirEntry
+		for _, dirEntry := range dirEntries {
+			isHidden, _ := IsHidden(dirEntry.Name())
+			if !isHidden {
+				if dirEntry.IsDir() || isExtSupported(dirEntry.Name()) {
+					sanitizedDirEntries = append(sanitizedDirEntries, dirEntry)
+				}
+			}
+		}
+
+		return sanitizedDirEntries
+
+	case <-errChan:
+		status.Error(fmt.Sprintf("Error reading directory %s", path))
+		return []os.DirEntry{}
+
+	case <-time.After(5 * time.Second):
+		status.Error(fmt.Sprintf("Timeout reading directory %s", path))
+		return []os.DirEntry{}
+	}
+}
+
+func IsHidden(file string) (bool, error) {
+	return strings.HasPrefix(file, "."), nil
+}
+
+func isExtSupported(path string) bool {
+	ext := strings.ToLower(filepath.Ext(path))
+	return (ext == ".jpg" || ext == ".jpeg" || ext == ".webp" || ext == ".png")
+}

pkg/tui/components/dialog/help.go

@@ -0,0 +1,200 @@
+package dialog
+
+import (
+	"strings"
+
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type helpCmp struct {
+	width  int
+	height int
+	keys   []key.Binding
+}
+
+func (h *helpCmp) Init() tea.Cmd {
+	return nil
+}
+
+func (h *helpCmp) SetBindings(k []key.Binding) {
+	h.keys = k
+}
+
+func (h *helpCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		h.width = 90
+		h.height = msg.Height
+	}
+	return h, nil
+}
+
+func removeDuplicateBindings(bindings []key.Binding) []key.Binding {
+	seen := make(map[string]struct{})
+	result := make([]key.Binding, 0, len(bindings))
+
+	// Process bindings in reverse order
+	for i := len(bindings) - 1; i >= 0; i-- {
+		b := bindings[i]
+		k := strings.Join(b.Keys(), " ")
+		if _, ok := seen[k]; ok {
+			// duplicate, skip
+			continue
+		}
+		seen[k] = struct{}{}
+		// Add to the beginning of result to maintain original order
+		result = append([]key.Binding{b}, result...)
+	}
+
+	return result
+}
+
+func (h *helpCmp) render() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	helpKeyStyle := styles.Bold().
+		Background(t.Background()).
+		Foreground(t.Text()).
+		Padding(0, 1, 0, 0)
+
+	helpDescStyle := styles.Regular().
+		Background(t.Background()).
+		Foreground(t.TextMuted())
+
+	// Compile list of bindings to render
+	bindings := removeDuplicateBindings(h.keys)
+
+	// Enumerate through each group of bindings, populating a series of
+	// pairs of columns, one for keys, one for descriptions
+	var (
+		pairs []string
+		width int
+		rows  = 12 - 2
+	)
+
+	for i := 0; i < len(bindings); i += rows {
+		var (
+			keys  []string
+			descs []string
+		)
+		for j := i; j < min(i+rows, len(bindings)); j++ {
+			keys = append(keys, helpKeyStyle.Render(bindings[j].Help().Key))
+			descs = append(descs, helpDescStyle.Render(bindings[j].Help().Desc))
+		}
+
+		// Render pair of columns; beyond the first pair, render a three space
+		// left margin, in order to visually separate the pairs.
+		var cols []string
+		if len(pairs) > 0 {
+			cols = []string{baseStyle.Render("   ")}
+		}
+
+		maxDescWidth := 0
+		for _, desc := range descs {
+			if maxDescWidth < lipgloss.Width(desc) {
+				maxDescWidth = lipgloss.Width(desc)
+			}
+		}
+		for i := range descs {
+			remainingWidth := maxDescWidth - lipgloss.Width(descs[i])
+			if remainingWidth > 0 {
+				descs[i] = descs[i] + baseStyle.Render(strings.Repeat(" ", remainingWidth))
+			}
+		}
+		maxKeyWidth := 0
+		for _, key := range keys {
+			if maxKeyWidth < lipgloss.Width(key) {
+				maxKeyWidth = lipgloss.Width(key)
+			}
+		}
+		for i := range keys {
+			remainingWidth := maxKeyWidth - lipgloss.Width(keys[i])
+			if remainingWidth > 0 {
+				keys[i] = keys[i] + baseStyle.Render(strings.Repeat(" ", remainingWidth))
+			}
+		}
+
+		cols = append(cols,
+			strings.Join(keys, "\n"),
+			strings.Join(descs, "\n"),
+		)
+
+		pair := baseStyle.Render(lipgloss.JoinHorizontal(lipgloss.Top, cols...))
+		// check whether it exceeds the maximum width avail (the width of the
+		// terminal, subtracting 2 for the borders).
+		width += lipgloss.Width(pair)
+		if width > h.width-2 {
+			break
+		}
+		pairs = append(pairs, pair)
+	}
+
+	// https://github.com/charmbracelet/lipgloss/issues/209
+	if len(pairs) > 1 {
+		prefix := pairs[:len(pairs)-1]
+		lastPair := pairs[len(pairs)-1]
+		prefix = append(prefix, lipgloss.Place(
+			lipgloss.Width(lastPair),   // width
+			lipgloss.Height(prefix[0]), // height
+			lipgloss.Left,              // x
+			lipgloss.Top,               // y
+			lastPair,                   // content
+			lipgloss.WithWhitespaceBackground(t.Background()),
+		))
+		content := baseStyle.Width(h.width).Render(
+			lipgloss.JoinHorizontal(
+				lipgloss.Top,
+				prefix...,
+			),
+		)
+		return content
+	}
+
+	// Join pairs of columns and enclose in a border
+	content := baseStyle.Width(h.width).Render(
+		lipgloss.JoinHorizontal(
+			lipgloss.Top,
+			pairs...,
+		),
+	)
+	return content
+}
+
+func (h *helpCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	content := h.render()
+	header := baseStyle.
+		Bold(true).
+		Width(lipgloss.Width(content)).
+		Foreground(t.Primary()).
+		Render("Keyboard Shortcuts")
+
+	return baseStyle.Padding(1).
+		Border(lipgloss.RoundedBorder()).
+		BorderForeground(t.TextMuted()).
+		Width(h.width).
+		BorderBackground(t.Background()).
+		Render(
+			lipgloss.JoinVertical(lipgloss.Center,
+				header,
+				baseStyle.Render(strings.Repeat(" ", lipgloss.Width(header))),
+				content,
+			),
+		)
+}
+
+type HelpCmp interface {
+	tea.Model
+	SetBindings([]key.Binding)
+}
+
+func NewHelpCmp() HelpCmp {
+	return &helpCmp{}
+}

pkg/tui/components/dialog/init.go

@@ -0,0 +1,189 @@
+package dialog
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+// InitDialogCmp is a component that asks the user if they want to initialize the project.
+type InitDialogCmp struct {
+	width, height int
+	selected      int
+	keys          initDialogKeyMap
+}
+
+// NewInitDialogCmp creates a new InitDialogCmp.
+func NewInitDialogCmp() InitDialogCmp {
+	return InitDialogCmp{
+		selected: 0,
+		keys:     initDialogKeyMap{},
+	}
+}
+
+type initDialogKeyMap struct {
+	Tab    key.Binding
+	Left   key.Binding
+	Right  key.Binding
+	Enter  key.Binding
+	Escape key.Binding
+	Y      key.Binding
+	N      key.Binding
+}
+
+// ShortHelp implements key.Map.
+func (k initDialogKeyMap) ShortHelp() []key.Binding {
+	return []key.Binding{
+		key.NewBinding(
+			key.WithKeys("tab", "left", "right"),
+			key.WithHelp("tab/←/→", "toggle selection"),
+		),
+		key.NewBinding(
+			key.WithKeys("enter"),
+			key.WithHelp("enter", "confirm"),
+		),
+		key.NewBinding(
+			key.WithKeys("esc", "q"),
+			key.WithHelp("esc/q", "cancel"),
+		),
+		key.NewBinding(
+			key.WithKeys("y", "n"),
+			key.WithHelp("y/n", "yes/no"),
+		),
+	}
+}
+
+// FullHelp implements key.Map.
+func (k initDialogKeyMap) FullHelp() [][]key.Binding {
+	return [][]key.Binding{k.ShortHelp()}
+}
+
+// Init implements tea.Model.
+func (m InitDialogCmp) Init() tea.Cmd {
+	return nil
+}
+
+// Update implements tea.Model.
+func (m InitDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, key.NewBinding(key.WithKeys("esc"))):
+			return m, util.CmdHandler(CloseInitDialogMsg{Initialize: false})
+		case key.Matches(msg, key.NewBinding(key.WithKeys("tab", "left", "right", "h", "l"))):
+			m.selected = (m.selected + 1) % 2
+			return m, nil
+		case key.Matches(msg, key.NewBinding(key.WithKeys("enter"))):
+			return m, util.CmdHandler(CloseInitDialogMsg{Initialize: m.selected == 0})
+		case key.Matches(msg, key.NewBinding(key.WithKeys("y"))):
+			return m, util.CmdHandler(CloseInitDialogMsg{Initialize: true})
+		case key.Matches(msg, key.NewBinding(key.WithKeys("n"))):
+			return m, util.CmdHandler(CloseInitDialogMsg{Initialize: false})
+		}
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		m.height = msg.Height
+	}
+	return m, nil
+}
+
+// View implements tea.Model.
+func (m InitDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	// Calculate width needed for content
+	maxWidth := 60 // Width for explanation text
+
+	title := baseStyle.
+		Foreground(t.Primary()).
+		Bold(true).
+		Width(maxWidth).
+		Padding(0, 1).
+		Render("Initialize Project")
+
+	explanation := baseStyle.
+		Foreground(t.Text()).
+		Width(maxWidth).
+		Padding(0, 1).
+		Render("Initialization generates a new CONTEXT.md file that contains information about your codebase, this file serves as memory for each project, you can freely add to it to help the agents be better at their job.")
+
+	question := baseStyle.
+		Foreground(t.Text()).
+		Width(maxWidth).
+		Padding(1, 1).
+		Render("Would you like to initialize this project?")
+
+	maxWidth = min(maxWidth, m.width-10)
+	yesStyle := baseStyle
+	noStyle := baseStyle
+
+	if m.selected == 0 {
+		yesStyle = yesStyle.
+			Background(t.Primary()).
+			Foreground(t.Background()).
+			Bold(true)
+		noStyle = noStyle.
+			Background(t.Background()).
+			Foreground(t.Primary())
+	} else {
+		noStyle = noStyle.
+			Background(t.Primary()).
+			Foreground(t.Background()).
+			Bold(true)
+		yesStyle = yesStyle.
+			Background(t.Background()).
+			Foreground(t.Primary())
+	}
+
+	yes := yesStyle.Padding(0, 3).Render("Yes")
+	no := noStyle.Padding(0, 3).Render("No")
+
+	buttons := lipgloss.JoinHorizontal(lipgloss.Center, yes, baseStyle.Render("  "), no)
+	buttons = baseStyle.
+		Width(maxWidth).
+		Padding(1, 0).
+		Render(buttons)
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		title,
+		baseStyle.Width(maxWidth).Render(""),
+		explanation,
+		question,
+		buttons,
+		baseStyle.Width(maxWidth).Render(""),
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+// SetSize sets the size of the component.
+func (m *InitDialogCmp) SetSize(width, height int) {
+	m.width = width
+	m.height = height
+}
+
+// Bindings implements layout.Bindings.
+func (m InitDialogCmp) Bindings() []key.Binding {
+	return m.keys.ShortHelp()
+}
+
+// CloseInitDialogMsg is a message that is sent when the init dialog is closed.
+type CloseInitDialogMsg struct {
+	Initialize bool
+}
+
+// ShowInitDialogMsg is a message that is sent to show the init dialog.
+type ShowInitDialogMsg struct {
+	Show bool
+}

pkg/tui/components/dialog/models.go

@@ -0,0 +1,372 @@
+package dialog
+
+import (
+	"fmt"
+	"slices"
+	"strings"
+
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/llm/models"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+const (
+	numVisibleModels = 10
+	maxDialogWidth   = 40
+)
+
+// ModelSelectedMsg is sent when a model is selected
+type ModelSelectedMsg struct {
+	Model models.Model
+}
+
+// CloseModelDialogMsg is sent when a model is selected
+type CloseModelDialogMsg struct{}
+
+// ModelDialog interface for the model selection dialog
+type ModelDialog interface {
+	tea.Model
+	layout.Bindings
+}
+
+type modelDialogCmp struct {
+	models             []models.Model
+	provider           models.ModelProvider
+	availableProviders []models.ModelProvider
+
+	selectedIdx     int
+	width           int
+	height          int
+	scrollOffset    int
+	hScrollOffset   int
+	hScrollPossible bool
+}
+
+type modelKeyMap struct {
+	Up     key.Binding
+	Down   key.Binding
+	Left   key.Binding
+	Right  key.Binding
+	Enter  key.Binding
+	Escape key.Binding
+	J      key.Binding
+	K      key.Binding
+	H      key.Binding
+	L      key.Binding
+}
+
+var modelKeys = modelKeyMap{
+	Up: key.NewBinding(
+		key.WithKeys("up"),
+		key.WithHelp("↑", "previous model"),
+	),
+	Down: key.NewBinding(
+		key.WithKeys("down"),
+		key.WithHelp("↓", "next model"),
+	),
+	Left: key.NewBinding(
+		key.WithKeys("left"),
+		key.WithHelp("←", "scroll left"),
+	),
+	Right: key.NewBinding(
+		key.WithKeys("right"),
+		key.WithHelp("→", "scroll right"),
+	),
+	Enter: key.NewBinding(
+		key.WithKeys("enter"),
+		key.WithHelp("enter", "select model"),
+	),
+	Escape: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "close"),
+	),
+	J: key.NewBinding(
+		key.WithKeys("j"),
+		key.WithHelp("j", "next model"),
+	),
+	K: key.NewBinding(
+		key.WithKeys("k"),
+		key.WithHelp("k", "previous model"),
+	),
+	H: key.NewBinding(
+		key.WithKeys("h"),
+		key.WithHelp("h", "scroll left"),
+	),
+	L: key.NewBinding(
+		key.WithKeys("l"),
+		key.WithHelp("l", "scroll right"),
+	),
+}
+
+func (m *modelDialogCmp) Init() tea.Cmd {
+	m.setupModels()
+	return nil
+}
+
+func (m *modelDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, modelKeys.Up) || key.Matches(msg, modelKeys.K):
+			m.moveSelectionUp()
+		case key.Matches(msg, modelKeys.Down) || key.Matches(msg, modelKeys.J):
+			m.moveSelectionDown()
+		case key.Matches(msg, modelKeys.Left) || key.Matches(msg, modelKeys.H):
+			if m.hScrollPossible {
+				m.switchProvider(-1)
+			}
+		case key.Matches(msg, modelKeys.Right) || key.Matches(msg, modelKeys.L):
+			if m.hScrollPossible {
+				m.switchProvider(1)
+			}
+		case key.Matches(msg, modelKeys.Enter):
+			return m, util.CmdHandler(ModelSelectedMsg{Model: m.models[m.selectedIdx]})
+		case key.Matches(msg, modelKeys.Escape):
+			return m, util.CmdHandler(CloseModelDialogMsg{})
+		}
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		m.height = msg.Height
+	}
+
+	return m, nil
+}
+
+// moveSelectionUp moves the selection up or wraps to bottom
+func (m *modelDialogCmp) moveSelectionUp() {
+	if m.selectedIdx > 0 {
+		m.selectedIdx--
+	} else {
+		m.selectedIdx = len(m.models) - 1
+		m.scrollOffset = max(0, len(m.models)-numVisibleModels)
+	}
+
+	// Keep selection visible
+	if m.selectedIdx < m.scrollOffset {
+		m.scrollOffset = m.selectedIdx
+	}
+}
+
+// moveSelectionDown moves the selection down or wraps to top
+func (m *modelDialogCmp) moveSelectionDown() {
+	if m.selectedIdx < len(m.models)-1 {
+		m.selectedIdx++
+	} else {
+		m.selectedIdx = 0
+		m.scrollOffset = 0
+	}
+
+	// Keep selection visible
+	if m.selectedIdx >= m.scrollOffset+numVisibleModels {
+		m.scrollOffset = m.selectedIdx - (numVisibleModels - 1)
+	}
+}
+
+func (m *modelDialogCmp) switchProvider(offset int) {
+	newOffset := m.hScrollOffset + offset
+
+	// Ensure we stay within bounds
+	if newOffset < 0 {
+		newOffset = len(m.availableProviders) - 1
+	}
+	if newOffset >= len(m.availableProviders) {
+		newOffset = 0
+	}
+
+	m.hScrollOffset = newOffset
+	m.provider = m.availableProviders[m.hScrollOffset]
+	m.setupModelsForProvider(m.provider)
+}
+
+func (m *modelDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	// Capitalize first letter of provider name
+	providerName := strings.ToUpper(string(m.provider)[:1]) + string(m.provider[1:])
+	title := baseStyle.
+		Foreground(t.Primary()).
+		Bold(true).
+		Width(maxDialogWidth).
+		Padding(0, 0, 1).
+		Render(fmt.Sprintf("Select %s Model", providerName))
+
+	// Render visible models
+	endIdx := min(m.scrollOffset+numVisibleModels, len(m.models))
+	modelItems := make([]string, 0, endIdx-m.scrollOffset)
+
+	for i := m.scrollOffset; i < endIdx; i++ {
+		itemStyle := baseStyle.Width(maxDialogWidth)
+		if i == m.selectedIdx {
+			itemStyle = itemStyle.Background(t.Primary()).
+				Foreground(t.Background()).Bold(true)
+		}
+		modelItems = append(modelItems, itemStyle.Render(m.models[i].Name))
+	}
+
+	scrollIndicator := m.getScrollIndicators(maxDialogWidth)
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		title,
+		baseStyle.Width(maxDialogWidth).Render(lipgloss.JoinVertical(lipgloss.Left, modelItems...)),
+		scrollIndicator,
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+func (m *modelDialogCmp) getScrollIndicators(maxWidth int) string {
+	var indicator string
+
+	if len(m.models) > numVisibleModels {
+		if m.scrollOffset > 0 {
+			indicator += "↑ "
+		}
+		if m.scrollOffset+numVisibleModels < len(m.models) {
+			indicator += "↓ "
+		}
+	}
+
+	if m.hScrollPossible {
+		if m.hScrollOffset > 0 {
+			indicator = "← " + indicator
+		}
+		if m.hScrollOffset < len(m.availableProviders)-1 {
+			indicator += "→"
+		}
+	}
+
+	if indicator == "" {
+		return ""
+	}
+
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	return baseStyle.
+		Foreground(t.Primary()).
+		Width(maxWidth).
+		Align(lipgloss.Right).
+		Bold(true).
+		Render(indicator)
+}
+
+func (m *modelDialogCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(modelKeys)
+}
+
+func (m *modelDialogCmp) setupModels() {
+	cfg := config.Get()
+	modelInfo := GetSelectedModel(cfg)
+	m.availableProviders = getEnabledProviders(cfg)
+	m.hScrollPossible = len(m.availableProviders) > 1
+
+	m.provider = modelInfo.Provider
+	m.hScrollOffset = findProviderIndex(m.availableProviders, m.provider)
+
+	m.setupModelsForProvider(m.provider)
+}
+
+func GetSelectedModel(cfg *config.Config) models.Model {
+
+	agentCfg := cfg.Agents[config.AgentPrimary]
+	selectedModelId := agentCfg.Model
+	return models.SupportedModels[selectedModelId]
+}
+
+func getEnabledProviders(cfg *config.Config) []models.ModelProvider {
+	var providers []models.ModelProvider
+	for providerId, provider := range cfg.Providers {
+		if !provider.Disabled {
+			providers = append(providers, providerId)
+		}
+	}
+
+	// Sort by provider popularity
+	slices.SortFunc(providers, func(a, b models.ModelProvider) int {
+		rA := models.ProviderPopularity[a]
+		rB := models.ProviderPopularity[b]
+
+		// models not included in popularity ranking default to last
+		if rA == 0 {
+			rA = 999
+		}
+		if rB == 0 {
+			rB = 999
+		}
+		return rA - rB
+	})
+	return providers
+}
+
+// findProviderIndex returns the index of the provider in the list, or -1 if not found
+func findProviderIndex(providers []models.ModelProvider, provider models.ModelProvider) int {
+	for i, p := range providers {
+		if p == provider {
+			return i
+		}
+	}
+	return -1
+}
+
+func (m *modelDialogCmp) setupModelsForProvider(provider models.ModelProvider) {
+	cfg := config.Get()
+	agentCfg := cfg.Agents[config.AgentPrimary]
+	selectedModelId := agentCfg.Model
+
+	m.provider = provider
+	m.models = getModelsForProvider(provider)
+	m.selectedIdx = 0
+	m.scrollOffset = 0
+
+	// Try to select the current model if it belongs to this provider
+	if provider == models.SupportedModels[selectedModelId].Provider {
+		for i, model := range m.models {
+			if model.ID == selectedModelId {
+				m.selectedIdx = i
+				// Adjust scroll position to keep selected model visible
+				if m.selectedIdx >= numVisibleModels {
+					m.scrollOffset = m.selectedIdx - (numVisibleModels - 1)
+				}
+				break
+			}
+		}
+	}
+}
+
+func getModelsForProvider(provider models.ModelProvider) []models.Model {
+	var providerModels []models.Model
+	for _, model := range models.SupportedModels {
+		if model.Provider == provider {
+			providerModels = append(providerModels, model)
+		}
+	}
+
+	// reverse alphabetical order (if llm naming was consistent latest would appear first)
+	slices.SortFunc(providerModels, func(a, b models.Model) int {
+		if a.Name > b.Name {
+			return -1
+		} else if a.Name < b.Name {
+			return 1
+		}
+		return 0
+	})
+
+	return providerModels
+}
+
+func NewModelDialogCmp() ModelDialog {
+	return &modelDialogCmp{}
+}

pkg/tui/components/dialog/permission.go

@@ -0,0 +1,505 @@
+package dialog
+
+import (
+	"fmt"
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/viewport"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/diff"
+	"github.com/sst/opencode/internal/llm/tools"
+	"github.com/sst/opencode/internal/permission"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+	"path/filepath"
+	"strings"
+)
+
+type PermissionAction string
+
+// Permission responses
+const (
+	PermissionAllow           PermissionAction = "allow"
+	PermissionAllowForSession PermissionAction = "allow_session"
+	PermissionDeny            PermissionAction = "deny"
+)
+
+// PermissionResponseMsg represents the user's response to a permission request
+type PermissionResponseMsg struct {
+	Permission permission.PermissionRequest
+	Action     PermissionAction
+}
+
+// PermissionDialogCmp interface for permission dialog component
+type PermissionDialogCmp interface {
+	tea.Model
+	layout.Bindings
+	SetPermissions(permission permission.PermissionRequest) tea.Cmd
+}
+
+type permissionsMapping struct {
+	Left         key.Binding
+	Right        key.Binding
+	EnterSpace   key.Binding
+	Allow        key.Binding
+	AllowSession key.Binding
+	Deny         key.Binding
+	Tab          key.Binding
+}
+
+var permissionsKeys = permissionsMapping{
+	Left: key.NewBinding(
+		key.WithKeys("left"),
+		key.WithHelp("←", "switch options"),
+	),
+	Right: key.NewBinding(
+		key.WithKeys("right"),
+		key.WithHelp("→", "switch options"),
+	),
+	EnterSpace: key.NewBinding(
+		key.WithKeys("enter", " "),
+		key.WithHelp("enter/space", "confirm"),
+	),
+	Allow: key.NewBinding(
+		key.WithKeys("a"),
+		key.WithHelp("a", "allow"),
+	),
+	AllowSession: key.NewBinding(
+		key.WithKeys("s"),
+		key.WithHelp("s", "allow for session"),
+	),
+	Deny: key.NewBinding(
+		key.WithKeys("d"),
+		key.WithHelp("d", "deny"),
+	),
+	Tab: key.NewBinding(
+		key.WithKeys("tab"),
+		key.WithHelp("tab", "switch options"),
+	),
+}
+
+// permissionDialogCmp is the implementation of PermissionDialog
+type permissionDialogCmp struct {
+	width           int
+	height          int
+	permission      permission.PermissionRequest
+	windowSize      tea.WindowSizeMsg
+	contentViewPort viewport.Model
+	selectedOption  int // 0: Allow, 1: Allow for session, 2: Deny
+
+	diffCache     map[string]string
+	markdownCache map[string]string
+}
+
+func (p *permissionDialogCmp) Init() tea.Cmd {
+	return p.contentViewPort.Init()
+}
+
+func (p *permissionDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		p.windowSize = msg
+		cmd := p.SetSize()
+		cmds = append(cmds, cmd)
+		p.markdownCache = make(map[string]string)
+		p.diffCache = make(map[string]string)
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, permissionsKeys.Right) || key.Matches(msg, permissionsKeys.Tab):
+			p.selectedOption = (p.selectedOption + 1) % 3
+			return p, nil
+		case key.Matches(msg, permissionsKeys.Left):
+			p.selectedOption = (p.selectedOption + 2) % 3
+		case key.Matches(msg, permissionsKeys.EnterSpace):
+			return p, p.selectCurrentOption()
+		case key.Matches(msg, permissionsKeys.Allow):
+			return p, util.CmdHandler(PermissionResponseMsg{Action: PermissionAllow, Permission: p.permission})
+		case key.Matches(msg, permissionsKeys.AllowSession):
+			return p, util.CmdHandler(PermissionResponseMsg{Action: PermissionAllowForSession, Permission: p.permission})
+		case key.Matches(msg, permissionsKeys.Deny):
+			return p, util.CmdHandler(PermissionResponseMsg{Action: PermissionDeny, Permission: p.permission})
+		default:
+			// Pass other keys to viewport
+			viewPort, cmd := p.contentViewPort.Update(msg)
+			p.contentViewPort = viewPort
+			cmds = append(cmds, cmd)
+		}
+	}
+
+	return p, tea.Batch(cmds...)
+}
+
+func (p *permissionDialogCmp) selectCurrentOption() tea.Cmd {
+	var action PermissionAction
+
+	switch p.selectedOption {
+	case 0:
+		action = PermissionAllow
+	case 1:
+		action = PermissionAllowForSession
+	case 2:
+		action = PermissionDeny
+	}
+
+	return util.CmdHandler(PermissionResponseMsg{Action: action, Permission: p.permission})
+}
+
+func (p *permissionDialogCmp) renderButtons() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	allowStyle := baseStyle
+	allowSessionStyle := baseStyle
+	denyStyle := baseStyle
+	spacerStyle := baseStyle.Background(t.Background())
+
+	// Style the selected button
+	switch p.selectedOption {
+	case 0:
+		allowStyle = allowStyle.Background(t.Primary()).Foreground(t.Background())
+		allowSessionStyle = allowSessionStyle.Background(t.Background()).Foreground(t.Primary())
+		denyStyle = denyStyle.Background(t.Background()).Foreground(t.Primary())
+	case 1:
+		allowStyle = allowStyle.Background(t.Background()).Foreground(t.Primary())
+		allowSessionStyle = allowSessionStyle.Background(t.Primary()).Foreground(t.Background())
+		denyStyle = denyStyle.Background(t.Background()).Foreground(t.Primary())
+	case 2:
+		allowStyle = allowStyle.Background(t.Background()).Foreground(t.Primary())
+		allowSessionStyle = allowSessionStyle.Background(t.Background()).Foreground(t.Primary())
+		denyStyle = denyStyle.Background(t.Primary()).Foreground(t.Background())
+	}
+
+	allowButton := allowStyle.Padding(0, 1).Render("Allow (a)")
+	allowSessionButton := allowSessionStyle.Padding(0, 1).Render("Allow for session (s)")
+	denyButton := denyStyle.Padding(0, 1).Render("Deny (d)")
+
+	content := lipgloss.JoinHorizontal(
+		lipgloss.Left,
+		allowButton,
+		spacerStyle.Render("  "),
+		allowSessionButton,
+		spacerStyle.Render("  "),
+		denyButton,
+		spacerStyle.Render("  "),
+	)
+
+	remainingWidth := p.width - lipgloss.Width(content)
+	if remainingWidth > 0 {
+		content = spacerStyle.Render(strings.Repeat(" ", remainingWidth)) + content
+	}
+	return content
+}
+
+func (p *permissionDialogCmp) renderHeader() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	toolKey := baseStyle.Foreground(t.TextMuted()).Bold(true).Render("Tool")
+	toolValue := baseStyle.
+		Foreground(t.Text()).
+		Width(p.width - lipgloss.Width(toolKey)).
+		Render(fmt.Sprintf(": %s", p.permission.ToolName))
+
+	pathKey := baseStyle.Foreground(t.TextMuted()).Bold(true).Render("Path")
+	
+	// Get the current working directory to display relative path
+	relativePath := p.permission.Path
+	if filepath.IsAbs(relativePath) {
+		if cwd, err := filepath.Rel(config.WorkingDirectory(), relativePath); err == nil {
+			relativePath = cwd
+		}
+	}
+	
+	pathValue := baseStyle.
+		Foreground(t.Text()).
+		Width(p.width - lipgloss.Width(pathKey)).
+		Render(fmt.Sprintf(": %s", relativePath))
+
+	headerParts := []string{
+		lipgloss.JoinHorizontal(
+			lipgloss.Left,
+			toolKey,
+			toolValue,
+		),
+		baseStyle.Render(strings.Repeat(" ", p.width)),
+		lipgloss.JoinHorizontal(
+			lipgloss.Left,
+			pathKey,
+			pathValue,
+		),
+		baseStyle.Render(strings.Repeat(" ", p.width)),
+	}
+
+	// Add tool-specific header information
+	switch p.permission.ToolName {
+	case tools.BashToolName:
+		headerParts = append(headerParts, baseStyle.Foreground(t.TextMuted()).Width(p.width).Bold(true).Render("Command"))
+	case tools.EditToolName:
+		headerParts = append(headerParts, baseStyle.Foreground(t.TextMuted()).Width(p.width).Bold(true).Render("Diff"))
+	case tools.WriteToolName:
+		headerParts = append(headerParts, baseStyle.Foreground(t.TextMuted()).Width(p.width).Bold(true).Render("Diff"))
+	case tools.FetchToolName:
+		headerParts = append(headerParts, baseStyle.Foreground(t.TextMuted()).Width(p.width).Bold(true).Render("URL"))
+	}
+
+	return lipgloss.NewStyle().Background(t.Background()).Render(lipgloss.JoinVertical(lipgloss.Left, headerParts...))
+}
+
+func (p *permissionDialogCmp) renderBashContent() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	if pr, ok := p.permission.Params.(tools.BashPermissionsParams); ok {
+		content := fmt.Sprintf("```bash\n%s\n```", pr.Command)
+
+		// Use the cache for markdown rendering
+		renderedContent := p.GetOrSetMarkdown(p.permission.ID, func() (string, error) {
+			r := styles.GetMarkdownRenderer(p.width - 10)
+			s, err := r.Render(content)
+			return styles.ForceReplaceBackgroundWithLipgloss(s, t.Background()), err
+		})
+
+		finalContent := baseStyle.
+			Width(p.contentViewPort.Width).
+			Render(renderedContent)
+		p.contentViewPort.SetContent(finalContent)
+		return p.styleViewport()
+	}
+	return ""
+}
+
+func (p *permissionDialogCmp) renderEditContent() string {
+	if pr, ok := p.permission.Params.(tools.EditPermissionsParams); ok {
+		diff := p.GetOrSetDiff(p.permission.ID, func() (string, error) {
+			return diff.FormatDiff(pr.Diff, diff.WithTotalWidth(p.contentViewPort.Width))
+		})
+
+		p.contentViewPort.SetContent(diff)
+		return p.styleViewport()
+	}
+	return ""
+}
+
+func (p *permissionDialogCmp) renderPatchContent() string {
+	if pr, ok := p.permission.Params.(tools.EditPermissionsParams); ok {
+		diff := p.GetOrSetDiff(p.permission.ID, func() (string, error) {
+			return diff.FormatDiff(pr.Diff, diff.WithTotalWidth(p.contentViewPort.Width))
+		})
+
+		p.contentViewPort.SetContent(diff)
+		return p.styleViewport()
+	}
+	return ""
+}
+
+func (p *permissionDialogCmp) renderWriteContent() string {
+	if pr, ok := p.permission.Params.(tools.WritePermissionsParams); ok {
+		// Use the cache for diff rendering
+		diff := p.GetOrSetDiff(p.permission.ID, func() (string, error) {
+			return diff.FormatDiff(pr.Diff, diff.WithTotalWidth(p.contentViewPort.Width))
+		})
+
+		p.contentViewPort.SetContent(diff)
+		return p.styleViewport()
+	}
+	return ""
+}
+
+func (p *permissionDialogCmp) renderFetchContent() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	if pr, ok := p.permission.Params.(tools.FetchPermissionsParams); ok {
+		content := fmt.Sprintf("```bash\n%s\n```", pr.URL)
+
+		// Use the cache for markdown rendering
+		renderedContent := p.GetOrSetMarkdown(p.permission.ID, func() (string, error) {
+			r := styles.GetMarkdownRenderer(p.width - 10)
+			s, err := r.Render(content)
+			return styles.ForceReplaceBackgroundWithLipgloss(s, t.Background()), err
+		})
+
+		finalContent := baseStyle.
+			Width(p.contentViewPort.Width).
+			Render(renderedContent)
+		p.contentViewPort.SetContent(finalContent)
+		return p.styleViewport()
+	}
+	return ""
+}
+
+func (p *permissionDialogCmp) renderDefaultContent() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	content := p.permission.Description
+
+	// Use the cache for markdown rendering
+	renderedContent := p.GetOrSetMarkdown(p.permission.ID, func() (string, error) {
+		r := styles.GetMarkdownRenderer(p.width - 10)
+		s, err := r.Render(content)
+		return styles.ForceReplaceBackgroundWithLipgloss(s, t.Background()), err
+	})
+
+	finalContent := baseStyle.
+		Width(p.contentViewPort.Width).
+		Render(renderedContent)
+	p.contentViewPort.SetContent(finalContent)
+
+	if renderedContent == "" {
+		return ""
+	}
+
+	return p.styleViewport()
+}
+
+func (p *permissionDialogCmp) styleViewport() string {
+	t := theme.CurrentTheme()
+	contentStyle := lipgloss.NewStyle().
+		Background(t.Background())
+
+	return contentStyle.Render(p.contentViewPort.View())
+}
+
+func (p *permissionDialogCmp) render() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	title := baseStyle.
+		Bold(true).
+		Width(p.width - 4).
+		Foreground(t.Primary()).
+		Render("Permission Required")
+	// Render header
+	headerContent := p.renderHeader()
+	// Render buttons
+	buttons := p.renderButtons()
+
+	// Calculate content height dynamically based on window size
+	p.contentViewPort.Height = p.height - lipgloss.Height(headerContent) - lipgloss.Height(buttons) - 2 - lipgloss.Height(title)
+	p.contentViewPort.Width = p.width - 4
+
+	// Render content based on tool type
+	var contentFinal string
+	switch p.permission.ToolName {
+	case tools.BashToolName:
+		contentFinal = p.renderBashContent()
+	case tools.EditToolName:
+		contentFinal = p.renderEditContent()
+	case tools.PatchToolName:
+		contentFinal = p.renderPatchContent()
+	case tools.WriteToolName:
+		contentFinal = p.renderWriteContent()
+	case tools.FetchToolName:
+		contentFinal = p.renderFetchContent()
+	default:
+		contentFinal = p.renderDefaultContent()
+	}
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Top,
+		title,
+		baseStyle.Render(strings.Repeat(" ", lipgloss.Width(title))),
+		headerContent,
+		contentFinal,
+		buttons,
+		baseStyle.Render(strings.Repeat(" ", p.width-4)),
+	)
+
+	return baseStyle.
+		Padding(1, 0, 0, 1).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(p.width).
+		Height(p.height).
+		Render(
+			content,
+		)
+}
+
+func (p *permissionDialogCmp) View() string {
+	return p.render()
+}
+
+func (p *permissionDialogCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(permissionsKeys)
+}
+
+func (p *permissionDialogCmp) SetSize() tea.Cmd {
+	if p.permission.ID == "" {
+		return nil
+	}
+	switch p.permission.ToolName {
+	case tools.BashToolName:
+		p.width = int(float64(p.windowSize.Width) * 0.4)
+		p.height = int(float64(p.windowSize.Height) * 0.3)
+	case tools.EditToolName:
+		p.width = int(float64(p.windowSize.Width) * 0.8)
+		p.height = int(float64(p.windowSize.Height) * 0.8)
+	case tools.WriteToolName:
+		p.width = int(float64(p.windowSize.Width) * 0.8)
+		p.height = int(float64(p.windowSize.Height) * 0.8)
+	case tools.FetchToolName:
+		p.width = int(float64(p.windowSize.Width) * 0.4)
+		p.height = int(float64(p.windowSize.Height) * 0.3)
+	default:
+		p.width = int(float64(p.windowSize.Width) * 0.7)
+		p.height = int(float64(p.windowSize.Height) * 0.5)
+	}
+	return nil
+}
+
+func (p *permissionDialogCmp) SetPermissions(permission permission.PermissionRequest) tea.Cmd {
+	p.permission = permission
+	return p.SetSize()
+}
+
+// Helper to get or set cached diff content
+func (c *permissionDialogCmp) GetOrSetDiff(key string, generator func() (string, error)) string {
+	if cached, ok := c.diffCache[key]; ok {
+		return cached
+	}
+
+	content, err := generator()
+	if err != nil {
+		return fmt.Sprintf("Error formatting diff: %v", err)
+	}
+
+	c.diffCache[key] = content
+
+	return content
+}
+
+// Helper to get or set cached markdown content
+func (c *permissionDialogCmp) GetOrSetMarkdown(key string, generator func() (string, error)) string {
+	if cached, ok := c.markdownCache[key]; ok {
+		return cached
+	}
+
+	content, err := generator()
+	if err != nil {
+		return fmt.Sprintf("Error rendering markdown: %v", err)
+	}
+
+	c.markdownCache[key] = content
+
+	return content
+}
+
+func NewPermissionDialogCmp() PermissionDialogCmp {
+	// Create viewport for content
+	contentViewport := viewport.New(0, 0)
+
+	return &permissionDialogCmp{
+		contentViewPort: contentViewport,
+		selectedOption:  0, // Default to "Allow"
+		diffCache:       make(map[string]string),
+		markdownCache:   make(map[string]string),
+	}
+}

pkg/tui/components/dialog/quit.go

@@ -0,0 +1,136 @@
+package dialog
+
+import (
+	"strings"
+
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+const question = "Are you sure you want to quit?"
+
+type CloseQuitMsg struct{}
+
+type QuitDialog interface {
+	tea.Model
+	layout.Bindings
+}
+
+type quitDialogCmp struct {
+	selectedNo bool
+}
+
+type helpMapping struct {
+	LeftRight  key.Binding
+	EnterSpace key.Binding
+	Yes        key.Binding
+	No         key.Binding
+	Tab        key.Binding
+}
+
+var helpKeys = helpMapping{
+	LeftRight: key.NewBinding(
+		key.WithKeys("left", "right"),
+		key.WithHelp("←/→", "switch options"),
+	),
+	EnterSpace: key.NewBinding(
+		key.WithKeys("enter", " "),
+		key.WithHelp("enter/space", "confirm"),
+	),
+	Yes: key.NewBinding(
+		key.WithKeys("y", "Y"),
+		key.WithHelp("y/Y", "yes"),
+	),
+	No: key.NewBinding(
+		key.WithKeys("n", "N"),
+		key.WithHelp("n/N", "no"),
+	),
+	Tab: key.NewBinding(
+		key.WithKeys("tab"),
+		key.WithHelp("tab", "switch options"),
+	),
+}
+
+func (q *quitDialogCmp) Init() tea.Cmd {
+	return nil
+}
+
+func (q *quitDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, helpKeys.LeftRight) || key.Matches(msg, helpKeys.Tab):
+			q.selectedNo = !q.selectedNo
+			return q, nil
+		case key.Matches(msg, helpKeys.EnterSpace):
+			if !q.selectedNo {
+				return q, tea.Quit
+			}
+			return q, util.CmdHandler(CloseQuitMsg{})
+		case key.Matches(msg, helpKeys.Yes):
+			return q, tea.Quit
+		case key.Matches(msg, helpKeys.No):
+			return q, util.CmdHandler(CloseQuitMsg{})
+		}
+	}
+	return q, nil
+}
+
+func (q *quitDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	yesStyle := baseStyle
+	noStyle := baseStyle
+	spacerStyle := baseStyle.Background(t.Background())
+
+	if q.selectedNo {
+		noStyle = noStyle.Background(t.Primary()).Foreground(t.Background())
+		yesStyle = yesStyle.Background(t.Background()).Foreground(t.Primary())
+	} else {
+		yesStyle = yesStyle.Background(t.Primary()).Foreground(t.Background())
+		noStyle = noStyle.Background(t.Background()).Foreground(t.Primary())
+	}
+
+	yesButton := yesStyle.Padding(0, 1).Render("Yes")
+	noButton := noStyle.Padding(0, 1).Render("No")
+
+	buttons := lipgloss.JoinHorizontal(lipgloss.Left, yesButton, spacerStyle.Render("  "), noButton)
+
+	width := lipgloss.Width(question)
+	remainingWidth := width - lipgloss.Width(buttons)
+	if remainingWidth > 0 {
+		buttons = spacerStyle.Render(strings.Repeat(" ", remainingWidth)) + buttons
+	}
+
+	content := baseStyle.Render(
+		lipgloss.JoinVertical(
+			lipgloss.Center,
+			question,
+			"",
+			buttons,
+		),
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+func (q *quitDialogCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(helpKeys)
+}
+
+func NewQuitCmp() QuitDialog {
+	return &quitDialogCmp{
+		selectedNo: true,
+	}
+}

pkg/tui/components/dialog/session.go

@@ -0,0 +1,230 @@
+package dialog
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/session"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+// CloseSessionDialogMsg is sent when the session dialog is closed
+type CloseSessionDialogMsg struct {
+	Session *session.Session
+}
+
+// SessionDialog interface for the session switching dialog
+type SessionDialog interface {
+	tea.Model
+	layout.Bindings
+	SetSessions(sessions []session.Session)
+	SetSelectedSession(sessionID string)
+}
+
+type sessionDialogCmp struct {
+	sessions          []session.Session
+	selectedIdx       int
+	width             int
+	height            int
+	selectedSessionID string
+}
+
+type sessionKeyMap struct {
+	Up     key.Binding
+	Down   key.Binding
+	Enter  key.Binding
+	Escape key.Binding
+	J      key.Binding
+	K      key.Binding
+}
+
+var sessionKeys = sessionKeyMap{
+	Up: key.NewBinding(
+		key.WithKeys("up"),
+		key.WithHelp("↑", "previous session"),
+	),
+	Down: key.NewBinding(
+		key.WithKeys("down"),
+		key.WithHelp("↓", "next session"),
+	),
+	Enter: key.NewBinding(
+		key.WithKeys("enter"),
+		key.WithHelp("enter", "select session"),
+	),
+	Escape: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "close"),
+	),
+	J: key.NewBinding(
+		key.WithKeys("j"),
+		key.WithHelp("j", "next session"),
+	),
+	K: key.NewBinding(
+		key.WithKeys("k"),
+		key.WithHelp("k", "previous session"),
+	),
+}
+
+func (s *sessionDialogCmp) Init() tea.Cmd {
+	return nil
+}
+
+func (s *sessionDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, sessionKeys.Up) || key.Matches(msg, sessionKeys.K):
+			if s.selectedIdx > 0 {
+				s.selectedIdx--
+			}
+			return s, nil
+		case key.Matches(msg, sessionKeys.Down) || key.Matches(msg, sessionKeys.J):
+			if s.selectedIdx < len(s.sessions)-1 {
+				s.selectedIdx++
+			}
+			return s, nil
+		case key.Matches(msg, sessionKeys.Enter):
+			if len(s.sessions) > 0 {
+				selectedSession := s.sessions[s.selectedIdx]
+				s.selectedSessionID = selectedSession.ID
+
+				return s, util.CmdHandler(CloseSessionDialogMsg{
+					Session: &selectedSession,
+				})
+			}
+		case key.Matches(msg, sessionKeys.Escape):
+			return s, util.CmdHandler(CloseSessionDialogMsg{})
+		}
+	case tea.WindowSizeMsg:
+		s.width = msg.Width
+		s.height = msg.Height
+	}
+	return s, nil
+}
+
+func (s *sessionDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	if len(s.sessions) == 0 {
+		return baseStyle.Padding(1, 2).
+			Border(lipgloss.RoundedBorder()).
+			BorderBackground(t.Background()).
+			BorderForeground(t.TextMuted()).
+			Width(40).
+			Render("No sessions available")
+	}
+
+	// Calculate max width needed for session titles
+	maxWidth := 40 // Minimum width
+	for _, sess := range s.sessions {
+		if len(sess.Title) > maxWidth-4 { // Account for padding
+			maxWidth = len(sess.Title) + 4
+		}
+	}
+
+	maxWidth = max(30, min(maxWidth, s.width-15)) // Limit width to avoid overflow
+
+	// Limit height to avoid taking up too much screen space
+	maxVisibleSessions := min(10, len(s.sessions))
+
+	// Build the session list
+	sessionItems := make([]string, 0, maxVisibleSessions)
+	startIdx := 0
+
+	// If we have more sessions than can be displayed, adjust the start index
+	if len(s.sessions) > maxVisibleSessions {
+		// Center the selected item when possible
+		halfVisible := maxVisibleSessions / 2
+		if s.selectedIdx >= halfVisible && s.selectedIdx < len(s.sessions)-halfVisible {
+			startIdx = s.selectedIdx - halfVisible
+		} else if s.selectedIdx >= len(s.sessions)-halfVisible {
+			startIdx = len(s.sessions) - maxVisibleSessions
+		}
+	}
+
+	endIdx := min(startIdx+maxVisibleSessions, len(s.sessions))
+
+	for i := startIdx; i < endIdx; i++ {
+		sess := s.sessions[i]
+		itemStyle := baseStyle.Width(maxWidth)
+
+		if i == s.selectedIdx {
+			itemStyle = itemStyle.
+				Background(t.Primary()).
+				Foreground(t.Background()).
+				Bold(true)
+		}
+
+		sessionItems = append(sessionItems, itemStyle.Padding(0, 1).Render(sess.Title))
+	}
+
+	title := baseStyle.
+		Foreground(t.Primary()).
+		Bold(true).
+		Width(maxWidth).
+		Padding(0, 1).
+		Render("Switch Session")
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		title,
+		baseStyle.Width(maxWidth).Render(""),
+		baseStyle.Width(maxWidth).Render(lipgloss.JoinVertical(lipgloss.Left, sessionItems...)),
+		baseStyle.Width(maxWidth).Render(""),
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+func (s *sessionDialogCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(sessionKeys)
+}
+
+func (s *sessionDialogCmp) SetSessions(sessions []session.Session) {
+	s.sessions = sessions
+
+	// If we have a selected session ID, find its index
+	if s.selectedSessionID != "" {
+		for i, sess := range sessions {
+			if sess.ID == s.selectedSessionID {
+				s.selectedIdx = i
+				return
+			}
+		}
+	}
+
+	// Default to first session if selected not found
+	s.selectedIdx = 0
+}
+
+func (s *sessionDialogCmp) SetSelectedSession(sessionID string) {
+	s.selectedSessionID = sessionID
+
+	// Update the selected index if sessions are already loaded
+	if len(s.sessions) > 0 {
+		for i, sess := range s.sessions {
+			if sess.ID == sessionID {
+				s.selectedIdx = i
+				return
+			}
+		}
+	}
+}
+
+// NewSessionDialogCmp creates a new session switching dialog
+func NewSessionDialogCmp() SessionDialog {
+	return &sessionDialogCmp{
+		sessions:          []session.Session{},
+		selectedIdx:       0,
+		selectedSessionID: "",
+	}
+}

pkg/tui/components/dialog/theme.go

@@ -0,0 +1,199 @@
+package dialog
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+// ThemeChangedMsg is sent when the theme is changed
+type ThemeChangedMsg struct {
+	ThemeName string
+}
+
+// CloseThemeDialogMsg is sent when the theme dialog is closed
+type CloseThemeDialogMsg struct{}
+
+// ThemeDialog interface for the theme switching dialog
+type ThemeDialog interface {
+	tea.Model
+	layout.Bindings
+}
+
+type themeDialogCmp struct {
+	themes       []string
+	selectedIdx  int
+	width        int
+	height       int
+	currentTheme string
+}
+
+type themeKeyMap struct {
+	Up     key.Binding
+	Down   key.Binding
+	Enter  key.Binding
+	Escape key.Binding
+	J      key.Binding
+	K      key.Binding
+}
+
+var themeKeys = themeKeyMap{
+	Up: key.NewBinding(
+		key.WithKeys("up"),
+		key.WithHelp("↑", "previous theme"),
+	),
+	Down: key.NewBinding(
+		key.WithKeys("down"),
+		key.WithHelp("↓", "next theme"),
+	),
+	Enter: key.NewBinding(
+		key.WithKeys("enter"),
+		key.WithHelp("enter", "select theme"),
+	),
+	Escape: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "close"),
+	),
+	J: key.NewBinding(
+		key.WithKeys("j"),
+		key.WithHelp("j", "next theme"),
+	),
+	K: key.NewBinding(
+		key.WithKeys("k"),
+		key.WithHelp("k", "previous theme"),
+	),
+}
+
+func (t *themeDialogCmp) Init() tea.Cmd {
+	// Load available themes and update selectedIdx based on current theme
+	t.themes = theme.AvailableThemes()
+	t.currentTheme = theme.CurrentThemeName()
+
+	// Find the current theme in the list
+	for i, name := range t.themes {
+		if name == t.currentTheme {
+			t.selectedIdx = i
+			break
+		}
+	}
+
+	return nil
+}
+
+func (t *themeDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, themeKeys.Up) || key.Matches(msg, themeKeys.K):
+			if t.selectedIdx > 0 {
+				t.selectedIdx--
+			}
+			return t, nil
+		case key.Matches(msg, themeKeys.Down) || key.Matches(msg, themeKeys.J):
+			if t.selectedIdx < len(t.themes)-1 {
+				t.selectedIdx++
+			}
+			return t, nil
+		case key.Matches(msg, themeKeys.Enter):
+			if len(t.themes) > 0 {
+				previousTheme := theme.CurrentThemeName()
+				selectedTheme := t.themes[t.selectedIdx]
+				if previousTheme == selectedTheme {
+					return t, util.CmdHandler(CloseThemeDialogMsg{})
+				}
+				if err := theme.SetTheme(selectedTheme); err != nil {
+					status.Error(err.Error())
+					return t, nil
+				}
+				return t, util.CmdHandler(ThemeChangedMsg{
+					ThemeName: selectedTheme,
+				})
+			}
+		case key.Matches(msg, themeKeys.Escape):
+			return t, util.CmdHandler(CloseThemeDialogMsg{})
+		}
+	case tea.WindowSizeMsg:
+		t.width = msg.Width
+		t.height = msg.Height
+	}
+	return t, nil
+}
+
+func (t *themeDialogCmp) View() string {
+	currentTheme := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	if len(t.themes) == 0 {
+		return baseStyle.Padding(1, 2).
+			Border(lipgloss.RoundedBorder()).
+			BorderBackground(currentTheme.Background()).
+			BorderForeground(currentTheme.TextMuted()).
+			Width(40).
+			Render("No themes available")
+	}
+
+	// Calculate max width needed for theme names
+	maxWidth := 40 // Minimum width
+	for _, themeName := range t.themes {
+		if len(themeName) > maxWidth-4 { // Account for padding
+			maxWidth = len(themeName) + 4
+		}
+	}
+
+	maxWidth = max(30, min(maxWidth, t.width-15)) // Limit width to avoid overflow
+
+	// Build the theme list
+	themeItems := make([]string, 0, len(t.themes))
+	for i, themeName := range t.themes {
+		itemStyle := baseStyle.Width(maxWidth)
+
+		if i == t.selectedIdx {
+			itemStyle = itemStyle.
+				Background(currentTheme.Primary()).
+				Foreground(currentTheme.Background()).
+				Bold(true)
+		}
+
+		themeItems = append(themeItems, itemStyle.Padding(0, 1).Render(themeName))
+	}
+
+	title := baseStyle.
+		Foreground(currentTheme.Primary()).
+		Bold(true).
+		Width(maxWidth).
+		Padding(0, 1).
+		Render("Select Theme")
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		title,
+		baseStyle.Width(maxWidth).Render(""),
+		baseStyle.Width(maxWidth).Render(lipgloss.JoinVertical(lipgloss.Left, themeItems...)),
+		baseStyle.Width(maxWidth).Render(""),
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(currentTheme.Background()).
+		BorderForeground(currentTheme.TextMuted()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+func (t *themeDialogCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(themeKeys)
+}
+
+// NewThemeDialogCmp creates a new theme switching dialog
+func NewThemeDialogCmp() ThemeDialog {
+	return &themeDialogCmp{
+		themes:       []string{},
+		selectedIdx:  0,
+		currentTheme: "",
+	}
+}

pkg/tui/components/dialog/tools.go

@@ -0,0 +1,178 @@
+package dialog
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	utilComponents "github.com/sst/opencode/internal/tui/components/util"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+const (
+	maxToolsDialogWidth = 60
+	maxVisibleTools     = 15
+)
+
+// ToolsDialog interface for the tools list dialog
+type ToolsDialog interface {
+	tea.Model
+	layout.Bindings
+	SetTools(tools []string)
+}
+
+// ShowToolsDialogMsg is sent to show the tools dialog
+type ShowToolsDialogMsg struct {
+	Show bool
+}
+
+// CloseToolsDialogMsg is sent when the tools dialog is closed
+type CloseToolsDialogMsg struct{}
+
+type toolItem struct {
+	name string
+}
+
+func (t toolItem) Render(selected bool, width int) string {
+	th := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle().
+		Width(width).
+		Background(th.Background())
+	
+	if selected {
+		baseStyle = baseStyle.
+			Background(th.Primary()).
+			Foreground(th.Background()).
+			Bold(true)
+	} else {
+		baseStyle = baseStyle.
+			Foreground(th.Text())
+	}
+	
+	return baseStyle.Render(t.name)
+}
+
+type toolsDialogCmp struct {
+	tools       []toolItem
+	width       int
+	height      int
+	list        utilComponents.SimpleList[toolItem]
+}
+
+type toolsKeyMap struct {
+	Up     key.Binding
+	Down   key.Binding
+	Escape key.Binding
+	J      key.Binding
+	K      key.Binding
+}
+
+var toolsKeys = toolsKeyMap{
+	Up: key.NewBinding(
+		key.WithKeys("up"),
+		key.WithHelp("↑", "previous tool"),
+	),
+	Down: key.NewBinding(
+		key.WithKeys("down"),
+		key.WithHelp("↓", "next tool"),
+	),
+	Escape: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "close"),
+	),
+	J: key.NewBinding(
+		key.WithKeys("j"),
+		key.WithHelp("j", "next tool"),
+	),
+	K: key.NewBinding(
+		key.WithKeys("k"),
+		key.WithHelp("k", "previous tool"),
+	),
+}
+
+func (m *toolsDialogCmp) Init() tea.Cmd {
+	return nil
+}
+
+func (m *toolsDialogCmp) SetTools(tools []string) {
+	var toolItems []toolItem
+	for _, name := range tools {
+		toolItems = append(toolItems, toolItem{name: name})
+	}
+	
+	m.tools = toolItems
+	m.list.SetItems(toolItems)
+}
+
+func (m *toolsDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, toolsKeys.Escape):
+			return m, func() tea.Msg { return CloseToolsDialogMsg{} }
+		// Pass other key messages to the list component
+		default:
+			var cmd tea.Cmd
+			listModel, cmd := m.list.Update(msg)
+			m.list = listModel.(utilComponents.SimpleList[toolItem])
+			return m, cmd
+		}
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		m.height = msg.Height
+	}
+
+	// For non-key messages
+	var cmd tea.Cmd
+	listModel, cmd := m.list.Update(msg)
+	m.list = listModel.(utilComponents.SimpleList[toolItem])
+	return m, cmd
+}
+
+func (m *toolsDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle().Background(t.Background())
+
+	title := baseStyle.
+		Foreground(t.Primary()).
+		Bold(true).
+		Width(maxToolsDialogWidth).
+		Padding(0, 0, 1).
+		Render("Available Tools")
+
+	// Calculate dialog width based on content
+	dialogWidth := min(maxToolsDialogWidth, m.width/2)
+	m.list.SetMaxWidth(dialogWidth)
+	
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		title,
+		m.list.View(),
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Background(t.Background()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+func (m *toolsDialogCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(toolsKeys)
+}
+
+func NewToolsDialogCmp() ToolsDialog {
+	list := utilComponents.NewSimpleList[toolItem](
+		[]toolItem{},
+		maxVisibleTools,
+		"No tools available",
+		true,
+	)
+	
+	return &toolsDialogCmp{
+		list: list,
+	}
+}

pkg/tui/components/logs/details.go

@@ -0,0 +1,187 @@
+package logs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/viewport"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/logging"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type DetailComponent interface {
+	tea.Model
+	layout.Sizeable
+	layout.Bindings
+}
+
+type detailCmp struct {
+	width, height int
+	currentLog    logging.Log
+	viewport      viewport.Model
+	focused       bool
+}
+
+func (i *detailCmp) Init() tea.Cmd {
+	return nil
+}
+
+func (i *detailCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmd tea.Cmd
+	switch msg := msg.(type) {
+	case selectedLogMsg:
+		if msg.ID != i.currentLog.ID {
+			i.currentLog = logging.Log(msg)
+			// Defer content update to avoid blocking the UI
+			cmd = tea.Tick(time.Millisecond*1, func(time.Time) tea.Msg {
+				i.updateContent()
+				return nil
+			})
+		}
+	case tea.KeyMsg:
+		// Only process keyboard input when focused
+		if !i.focused {
+			return i, nil
+		}
+		// Handle keyboard input for scrolling
+		i.viewport, cmd = i.viewport.Update(msg)
+		return i, cmd
+	}
+
+	return i, cmd
+}
+
+func (i *detailCmp) updateContent() {
+	var content strings.Builder
+	t := theme.CurrentTheme()
+
+	// Format the header with timestamp and level
+	timeStyle := lipgloss.NewStyle().Foreground(t.TextMuted())
+	levelStyle := getLevelStyle(i.currentLog.Level)
+
+	// Format timestamp
+	timeStr := i.currentLog.Timestamp.Format(time.RFC3339)
+
+	header := lipgloss.JoinHorizontal(
+		lipgloss.Center,
+		timeStyle.Render(timeStr),
+		"  ",
+		levelStyle.Render(i.currentLog.Level),
+	)
+
+	content.WriteString(lipgloss.NewStyle().Bold(true).Render(header))
+	content.WriteString("\n\n")
+
+	// Message with styling
+	messageStyle := lipgloss.NewStyle().Bold(true).Foreground(t.Text())
+	content.WriteString(messageStyle.Render("Message:"))
+	content.WriteString("\n")
+	content.WriteString(lipgloss.NewStyle().Padding(0, 2).Width(i.width).Render(i.currentLog.Message))
+	content.WriteString("\n\n")
+
+	// Attributes section
+	if len(i.currentLog.Attributes) > 0 {
+		attrHeaderStyle := lipgloss.NewStyle().Bold(true).Foreground(t.Text())
+		content.WriteString(attrHeaderStyle.Render("Attributes:"))
+		content.WriteString("\n")
+
+		// Create a table-like display for attributes
+		keyStyle := lipgloss.NewStyle().Foreground(t.Primary()).Bold(true)
+		valueStyle := lipgloss.NewStyle().Foreground(t.Text())
+
+		for key, value := range i.currentLog.Attributes {
+			// if value is JSON, render it with indentation
+			if strings.HasPrefix(value, "{") {
+				var indented bytes.Buffer
+				if err := json.Indent(&indented, []byte(value), "", "  "); err != nil {
+					indented.WriteString(value)
+				}
+				value = indented.String()
+			}
+
+			attrLine := fmt.Sprintf("%s: %s",
+				keyStyle.Render(key),
+				valueStyle.Render(value),
+			)
+
+			content.WriteString(lipgloss.NewStyle().Padding(0, 2).Width(i.width).Render(attrLine))
+			content.WriteString("\n")
+		}
+	}
+
+	// Session ID if available
+	if i.currentLog.SessionID != "" {
+		sessionStyle := lipgloss.NewStyle().Bold(true).Foreground(t.Text())
+		content.WriteString("\n")
+		content.WriteString(sessionStyle.Render("Session:"))
+		content.WriteString("\n")
+		content.WriteString(lipgloss.NewStyle().Padding(0, 2).Width(i.width).Render(i.currentLog.SessionID))
+	}
+
+	i.viewport.SetContent(content.String())
+}
+
+func getLevelStyle(level string) lipgloss.Style {
+	style := lipgloss.NewStyle().Bold(true)
+	t := theme.CurrentTheme()
+
+	switch strings.ToLower(level) {
+	case "info":
+		return style.Foreground(t.Info())
+	case "warn", "warning":
+		return style.Foreground(t.Warning())
+	case "error", "err":
+		return style.Foreground(t.Error())
+	case "debug":
+		return style.Foreground(t.Success())
+	default:
+		return style.Foreground(t.Text())
+	}
+}
+
+func (i *detailCmp) View() string {
+	t := theme.CurrentTheme()
+	return styles.ForceReplaceBackgroundWithLipgloss(i.viewport.View(), t.Background())
+}
+
+func (i *detailCmp) GetSize() (int, int) {
+	return i.width, i.height
+}
+
+func (i *detailCmp) SetSize(width int, height int) tea.Cmd {
+	i.width = width
+	i.height = height
+	i.viewport.Width = i.width
+	i.viewport.Height = i.height
+	i.updateContent()
+	return nil
+}
+
+func (i *detailCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(i.viewport.KeyMap)
+}
+
+func NewLogsDetails() DetailComponent {
+	return &detailCmp{
+		viewport: viewport.New(0, 0),
+	}
+}
+
+// Focus implements the focusable interface
+func (i *detailCmp) Focus() {
+	i.focused = true
+	i.viewport.SetYOffset(i.viewport.YOffset)
+}
+
+// Blur implements the blurable interface
+func (i *detailCmp) Blur() {
+	i.focused = false
+}

pkg/tui/components/logs/table.go

@@ -0,0 +1,208 @@
+package logs
+
+import (
+	"context"
+	"log/slog"
+
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/table"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/logging"
+	"github.com/sst/opencode/internal/pubsub"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/state"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type TableComponent interface {
+	tea.Model
+	layout.Sizeable
+	layout.Bindings
+}
+
+type tableCmp struct {
+	app           *app.App
+	table         table.Model
+	focused       bool
+	logs          []logging.Log
+	selectedLogID string
+}
+
+type selectedLogMsg logging.Log
+
+type LogsLoadedMsg struct {
+	logs []logging.Log
+}
+
+func (i *tableCmp) Init() tea.Cmd {
+	return i.fetchLogs()
+}
+
+func (i *tableCmp) fetchLogs() tea.Cmd {
+	return func() tea.Msg {
+		ctx := context.Background()
+
+		var logs []logging.Log
+		var err error
+
+		// Limit the number of logs to improve performance
+		const logLimit = 100
+		if i.app.CurrentSession.ID == "" {
+			logs, err = i.app.Logs.ListAll(ctx, logLimit)
+		} else {
+			logs, err = i.app.Logs.ListBySession(ctx, i.app.CurrentSession.ID)
+		}
+
+		if err != nil {
+			slog.Error("Failed to fetch logs", "error", err)
+			return nil
+		}
+
+		return LogsLoadedMsg{logs: logs}
+	}
+}
+
+func (i *tableCmp) updateRows() tea.Cmd {
+	return func() tea.Msg {
+		rows := make([]table.Row, 0, len(i.logs))
+
+		for _, log := range i.logs {
+			timeStr := log.Timestamp.Local().Format("15:04:05")
+
+			// Include ID as hidden first column for selection
+			row := table.Row{
+				log.ID,
+				timeStr,
+				log.Level,
+				log.Message,
+			}
+			rows = append(rows, row)
+		}
+
+		i.table.SetRows(rows)
+		return nil
+	}
+}
+
+func (i *tableCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+
+	switch msg := msg.(type) {
+	case LogsLoadedMsg:
+		i.logs = msg.logs
+		return i, i.updateRows()
+
+	case state.SessionSelectedMsg:
+		return i, i.fetchLogs()
+
+	case pubsub.Event[logging.Log]:
+		if msg.Type == logging.EventLogCreated {
+			// Add the new log to our list
+			i.logs = append([]logging.Log{msg.Payload}, i.logs...)
+			// Keep the list at a reasonable size
+			if len(i.logs) > 100 {
+				i.logs = i.logs[:100]
+			}
+			return i, i.updateRows()
+		}
+		return i, nil
+	}
+
+	// Only process keyboard input when focused
+	if _, ok := msg.(tea.KeyMsg); ok && !i.focused {
+		return i, nil
+	}
+
+	t, cmd := i.table.Update(msg)
+	cmds = append(cmds, cmd)
+	i.table = t
+
+	selectedRow := i.table.SelectedRow()
+	if selectedRow != nil {
+		// Only send message if it's a new selection
+		if i.selectedLogID != selectedRow[0] {
+			cmds = append(cmds, func() tea.Msg {
+				for _, log := range i.logs {
+					if log.ID == selectedRow[0] {
+						return selectedLogMsg(log)
+					}
+				}
+				return nil
+			})
+		}
+
+		i.selectedLogID = selectedRow[0]
+	}
+
+	return i, tea.Batch(cmds...)
+}
+
+func (i *tableCmp) View() string {
+	t := theme.CurrentTheme()
+	defaultStyles := table.DefaultStyles()
+	defaultStyles.Selected = defaultStyles.Selected.Foreground(t.Primary())
+	i.table.SetStyles(defaultStyles)
+	return i.table.View()
+}
+
+func (i *tableCmp) GetSize() (int, int) {
+	return i.table.Width(), i.table.Height()
+}
+
+func (i *tableCmp) SetSize(width int, height int) tea.Cmd {
+	i.table.SetWidth(width)
+	i.table.SetHeight(height)
+	columns := i.table.Columns()
+
+	// Calculate widths for visible columns
+	timeWidth := 8  // Fixed width for Time column
+	levelWidth := 7 // Fixed width for Level column
+
+	// Message column gets the remaining space
+	messageWidth := width - timeWidth - levelWidth - 5 // 5 for padding and borders
+
+	// Set column widths
+	columns[0].Width = 0 // ID column (hidden)
+	columns[1].Width = timeWidth
+	columns[2].Width = levelWidth
+	columns[3].Width = messageWidth
+
+	i.table.SetColumns(columns)
+	return nil
+}
+
+func (i *tableCmp) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(i.table.KeyMap)
+}
+
+func NewLogsTable(app *app.App) TableComponent {
+	columns := []table.Column{
+		{Title: "ID", Width: 0}, // ID column with zero width
+		{Title: "Time", Width: 8},
+		{Title: "Level", Width: 7},
+		{Title: "Message", Width: 30},
+	}
+
+	tableModel := table.New(
+		table.WithColumns(columns),
+	)
+	tableModel.Focus()
+	return &tableCmp{
+		app:   app,
+		table: tableModel,
+		logs:  []logging.Log{},
+	}
+}
+
+// Focus implements the focusable interface
+func (i *tableCmp) Focus() {
+	i.focused = true
+	i.table.Focus()
+}
+
+// Blur implements the blurable interface
+func (i *tableCmp) Blur() {
+	i.focused = false
+	i.table.Blur()
+}

pkg/tui/components/spinner/spinner.go

@@ -0,0 +1,127 @@
+package spinner
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/charmbracelet/bubbles/spinner"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+)
+
+// Spinner wraps the bubbles spinner for both interactive and non-interactive mode
+type Spinner struct {
+	model  spinner.Model
+	done   chan struct{}
+	prog   *tea.Program
+	ctx    context.Context
+	cancel context.CancelFunc
+}
+
+// spinnerModel is the tea.Model for the spinner
+type spinnerModel struct {
+	spinner  spinner.Model
+	message  string
+	quitting bool
+}
+
+func (m spinnerModel) Init() tea.Cmd {
+	return m.spinner.Tick
+}
+
+func (m spinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		m.quitting = true
+		return m, tea.Quit
+	case spinner.TickMsg:
+		var cmd tea.Cmd
+		m.spinner, cmd = m.spinner.Update(msg)
+		return m, cmd
+	case quitMsg:
+		m.quitting = true
+		return m, tea.Quit
+	default:
+		return m, nil
+	}
+}
+
+func (m spinnerModel) View() string {
+	if m.quitting {
+		return ""
+	}
+	return fmt.Sprintf("%s %s", m.spinner.View(), m.message)
+}
+
+// quitMsg is sent when we want to quit the spinner
+type quitMsg struct{}
+
+// NewSpinner creates a new spinner with the given message
+func NewSpinner(message string) *Spinner {
+	s := spinner.New()
+	s.Spinner = spinner.Dot
+	s.Style = s.Style.Foreground(s.Style.GetForeground())
+
+	ctx, cancel := context.WithCancel(context.Background())
+
+	model := spinnerModel{
+		spinner: s,
+		message: message,
+	}
+
+	prog := tea.NewProgram(model, tea.WithOutput(os.Stderr), tea.WithoutCatchPanics())
+
+	return &Spinner{
+		model:  s,
+		done:   make(chan struct{}),
+		prog:   prog,
+		ctx:    ctx,
+		cancel: cancel,
+	}
+}
+
+// NewThemedSpinner creates a new spinner with the given message and color
+func NewThemedSpinner(message string, color lipgloss.AdaptiveColor) *Spinner {
+	s := spinner.New()
+	s.Spinner = spinner.Dot
+	s.Style = s.Style.Foreground(color)
+
+	ctx, cancel := context.WithCancel(context.Background())
+
+	model := spinnerModel{
+		spinner: s,
+		message: message,
+	}
+
+	prog := tea.NewProgram(model, tea.WithOutput(os.Stderr), tea.WithoutCatchPanics())
+
+	return &Spinner{
+		model:  s,
+		done:   make(chan struct{}),
+		prog:   prog,
+		ctx:    ctx,
+		cancel: cancel,
+	}
+}
+
+// Start begins the spinner animation
+func (s *Spinner) Start() {
+	go func() {
+		defer close(s.done)
+		go func() {
+			<-s.ctx.Done()
+			s.prog.Send(quitMsg{})
+		}()
+		_, err := s.prog.Run()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error running spinner: %v\n", err)
+		}
+	}()
+}
+
+// Stop ends the spinner animation
+func (s *Spinner) Stop() {
+	s.cancel()
+	<-s.done
+}

pkg/tui/components/spinner/spinner_test.go

@@ -0,0 +1,24 @@
+package spinner
+
+import (
+	"testing"
+	"time"
+)
+
+func TestSpinner(t *testing.T) {
+	t.Parallel()
+
+	// Create a spinner
+	s := NewSpinner("Test spinner")
+	
+	// Start the spinner
+	s.Start()
+	
+	// Wait a bit to let it run
+	time.Sleep(100 * time.Millisecond)
+	
+	// Stop the spinner
+	s.Stop()
+	
+	// If we got here without panicking, the test passes
+}

pkg/tui/components/util/simple-list.go

@@ -0,0 +1,159 @@
+package utilComponents
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type SimpleListItem interface {
+	Render(selected bool, width int) string
+}
+
+type SimpleList[T SimpleListItem] interface {
+	tea.Model
+	layout.Bindings
+	SetMaxWidth(maxWidth int)
+	GetSelectedItem() (item T, idx int)
+	SetItems(items []T)
+	GetItems() []T
+}
+
+type simpleListCmp[T SimpleListItem] struct {
+	fallbackMsg         string
+	items               []T
+	selectedIdx         int
+	maxWidth            int
+	maxVisibleItems     int
+	useAlphaNumericKeys bool
+	width               int
+	height              int
+}
+
+type simpleListKeyMap struct {
+	Up        key.Binding
+	Down      key.Binding
+	UpAlpha   key.Binding
+	DownAlpha key.Binding
+}
+
+var simpleListKeys = simpleListKeyMap{
+	Up: key.NewBinding(
+		key.WithKeys("up"),
+		key.WithHelp("↑", "previous list item"),
+	),
+	Down: key.NewBinding(
+		key.WithKeys("down"),
+		key.WithHelp("↓", "next list item"),
+	),
+	UpAlpha: key.NewBinding(
+		key.WithKeys("k"),
+		key.WithHelp("k", "previous list item"),
+	),
+	DownAlpha: key.NewBinding(
+		key.WithKeys("j"),
+		key.WithHelp("j", "next list item"),
+	),
+}
+
+func (c *simpleListCmp[T]) Init() tea.Cmd {
+	return nil
+}
+
+func (c *simpleListCmp[T]) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, simpleListKeys.Up) || (c.useAlphaNumericKeys && key.Matches(msg, simpleListKeys.UpAlpha)):
+			if c.selectedIdx > 0 {
+				c.selectedIdx--
+			}
+			return c, nil
+		case key.Matches(msg, simpleListKeys.Down) || (c.useAlphaNumericKeys && key.Matches(msg, simpleListKeys.DownAlpha)):
+			if c.selectedIdx < len(c.items)-1 {
+				c.selectedIdx++
+			}
+			return c, nil
+		}
+	}
+
+	return c, nil
+}
+
+func (c *simpleListCmp[T]) BindingKeys() []key.Binding {
+	return layout.KeyMapToSlice(simpleListKeys)
+}
+
+func (c *simpleListCmp[T]) GetSelectedItem() (T, int) {
+	if len(c.items) > 0 {
+		return c.items[c.selectedIdx], c.selectedIdx
+	}
+
+	var zero T
+	return zero, -1
+}
+
+func (c *simpleListCmp[T]) SetItems(items []T) {
+	c.selectedIdx = 0
+	c.items = items
+}
+
+func (c *simpleListCmp[T]) GetItems() []T {
+	return c.items
+}
+
+func (c *simpleListCmp[T]) SetMaxWidth(width int) {
+	c.maxWidth = width
+}
+
+func (c *simpleListCmp[T]) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	items := c.items
+	maxWidth := c.maxWidth
+	maxVisibleItems := min(c.maxVisibleItems, len(items))
+	startIdx := 0
+
+	if len(items) <= 0 {
+		return baseStyle.
+			Background(t.Background()).
+			Padding(0, 1).
+			Width(maxWidth).
+			Render(c.fallbackMsg)
+	}
+
+	if len(items) > maxVisibleItems {
+		halfVisible := maxVisibleItems / 2
+		if c.selectedIdx >= halfVisible && c.selectedIdx < len(items)-halfVisible {
+			startIdx = c.selectedIdx - halfVisible
+		} else if c.selectedIdx >= len(items)-halfVisible {
+			startIdx = len(items) - maxVisibleItems
+		}
+	}
+
+	endIdx := min(startIdx+maxVisibleItems, len(items))
+
+	listItems := make([]string, 0, maxVisibleItems)
+
+	for i := startIdx; i < endIdx; i++ {
+		item := items[i]
+		title := item.Render(i == c.selectedIdx, maxWidth)
+		listItems = append(listItems, title)
+	}
+
+	return lipgloss.JoinVertical(lipgloss.Left, listItems...)
+}
+
+func NewSimpleList[T SimpleListItem](items []T, maxVisibleItems int, fallbackMsg string, useAlphaNumericKeys bool) SimpleList[T] {
+	return &simpleListCmp[T]{
+		fallbackMsg:         fallbackMsg,
+		items:               items,
+		maxVisibleItems:     maxVisibleItems,
+		useAlphaNumericKeys: useAlphaNumericKeys,
+		selectedIdx:         0,
+	}
+}

pkg/tui/image/clipboard_unix.go

@@ -0,0 +1,49 @@
+//go:build !windows
+
+package image
+
+import (
+	"bytes"
+	"fmt"
+	"image"
+	"github.com/atotto/clipboard"
+)
+
+func GetImageFromClipboard() ([]byte, string, error) {
+	text, err := clipboard.ReadAll()
+	if err != nil {
+		return nil, "", fmt.Errorf("Error reading clipboard")
+	}
+
+	if text == "" {
+		return nil, "", nil
+	}
+
+	binaryData := []byte(text)
+	imageBytes, err := binaryToImage(binaryData)
+	if err != nil {
+		return nil, text, nil
+	}
+	return imageBytes, "", nil
+
+}
+
+
+
+func binaryToImage(data []byte) ([]byte, error) {
+	reader := bytes.NewReader(data)
+	img, _, err := image.Decode(reader)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to covert bytes to image")
+	}
+
+	return ImageToBytes(img)
+}
+
+
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}

pkg/tui/image/clipboard_windows.go

@@ -0,0 +1,192 @@
+//go:build windows
+
+package image
+
+import (
+	"bytes"
+	"fmt"
+	"image"
+	"image/color"
+	"log/slog"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	user32                     = syscall.NewLazyDLL("user32.dll")
+	kernel32                   = syscall.NewLazyDLL("kernel32.dll")
+	openClipboard              = user32.NewProc("OpenClipboard")
+	closeClipboard             = user32.NewProc("CloseClipboard")
+	getClipboardData           = user32.NewProc("GetClipboardData")
+	isClipboardFormatAvailable = user32.NewProc("IsClipboardFormatAvailable")
+	globalLock                 = kernel32.NewProc("GlobalLock")
+	globalUnlock               = kernel32.NewProc("GlobalUnlock")
+	globalSize                 = kernel32.NewProc("GlobalSize")
+)
+
+const (
+	CF_TEXT        = 1
+	CF_UNICODETEXT = 13
+	CF_DIB         = 8
+)
+
+type BITMAPINFOHEADER struct {
+	BiSize          uint32
+	BiWidth         int32
+	BiHeight        int32
+	BiPlanes        uint16
+	BiBitCount      uint16
+	BiCompression   uint32
+	BiSizeImage     uint32
+	BiXPelsPerMeter int32
+	BiYPelsPerMeter int32
+	BiClrUsed       uint32
+	BiClrImportant  uint32
+}
+
+func GetImageFromClipboard() ([]byte, string, error) {
+	ret, _, _ := openClipboard.Call(0)
+	if ret == 0 {
+		return nil, "", fmt.Errorf("failed to open clipboard")
+	}
+	defer func(closeClipboard *syscall.LazyProc, a ...uintptr) {
+		_, _, err := closeClipboard.Call(a...)
+		if err != nil {
+			slog.Error("close clipboard failed")
+			return
+		}
+	}(closeClipboard)
+	isTextAvailable, _, _ := isClipboardFormatAvailable.Call(uintptr(CF_TEXT))
+	isUnicodeTextAvailable, _, _ := isClipboardFormatAvailable.Call(uintptr(CF_UNICODETEXT))
+
+	if isTextAvailable != 0 || isUnicodeTextAvailable != 0 {
+		// Get text from clipboard
+		var formatToUse uintptr = CF_TEXT
+		if isUnicodeTextAvailable != 0 {
+			formatToUse = CF_UNICODETEXT
+		}
+
+		hClipboardText, _, _ := getClipboardData.Call(formatToUse)
+		if hClipboardText != 0 {
+			textPtr, _, _ := globalLock.Call(hClipboardText)
+			if textPtr != 0 {
+				defer func(globalUnlock *syscall.LazyProc, a ...uintptr) {
+					_, _, err := globalUnlock.Call(a...)
+					if err != nil {
+						slog.Error("Global unlock failed")
+						return
+					}
+				}(globalUnlock, hClipboardText)
+
+				// Get clipboard text
+				var clipboardText string
+				if formatToUse == CF_UNICODETEXT {
+					// Convert wide string to Go string
+					clipboardText = syscall.UTF16ToString((*[1 << 20]uint16)(unsafe.Pointer(textPtr))[:])
+				} else {
+					// Get size of ANSI text
+					size, _, _ := globalSize.Call(hClipboardText)
+					if size > 0 {
+						// Convert ANSI string to Go string
+						textBytes := make([]byte, size)
+						copy(textBytes, (*[1 << 20]byte)(unsafe.Pointer(textPtr))[:size:size])
+						clipboardText = bytesToString(textBytes)
+					}
+				}
+
+				// Check if the text is not empty
+				if clipboardText != "" {
+					return nil, clipboardText, nil
+				}
+			}
+		}
+	}
+	hClipboardData, _, _ := getClipboardData.Call(uintptr(CF_DIB))
+	if hClipboardData == 0 {
+		return nil, "", fmt.Errorf("failed to get clipboard data")
+	}
+
+	dataPtr, _, _ := globalLock.Call(hClipboardData)
+	if dataPtr == 0 {
+		return nil, "", fmt.Errorf("failed to lock clipboard data")
+	}
+	defer func(globalUnlock *syscall.LazyProc, a ...uintptr) {
+		_, _, err := globalUnlock.Call(a...)
+		if err != nil {
+			slog.Error("Global unlock failed")
+			return
+		}
+	}(globalUnlock, hClipboardData)
+
+	bmiHeader := (*BITMAPINFOHEADER)(unsafe.Pointer(dataPtr))
+
+	width := int(bmiHeader.BiWidth)
+	height := int(bmiHeader.BiHeight)
+	if height < 0 {
+		height = -height
+	}
+	bitsPerPixel := int(bmiHeader.BiBitCount)
+
+	img := image.NewRGBA(image.Rect(0, 0, width, height))
+
+	var bitsOffset uintptr
+	if bitsPerPixel <= 8 {
+		numColors := uint32(1) << bitsPerPixel
+		if bmiHeader.BiClrUsed > 0 {
+			numColors = bmiHeader.BiClrUsed
+		}
+		bitsOffset = unsafe.Sizeof(*bmiHeader) + uintptr(numColors*4)
+	} else {
+		bitsOffset = unsafe.Sizeof(*bmiHeader)
+	}
+
+	for y := range height {
+		for x := range width {
+
+			srcY := height - y - 1
+			if bmiHeader.BiHeight < 0 {
+				srcY = y
+			}
+
+			var pixelPointer unsafe.Pointer
+			var r, g, b, a uint8
+
+			switch bitsPerPixel {
+			case 24:
+				stride := (width*3 + 3) &^ 3
+				pixelPointer = unsafe.Pointer(dataPtr + bitsOffset + uintptr(srcY*stride+x*3))
+				b = *(*byte)(pixelPointer)
+				g = *(*byte)(unsafe.Add(pixelPointer, 1))
+				r = *(*byte)(unsafe.Add(pixelPointer, 2))
+				a = 255
+			case 32:
+				pixelPointer = unsafe.Pointer(dataPtr + bitsOffset + uintptr(srcY*width*4+x*4))
+				b = *(*byte)(pixelPointer)
+				g = *(*byte)(unsafe.Add(pixelPointer, 1))
+				r = *(*byte)(unsafe.Add(pixelPointer, 2))
+				a = *(*byte)(unsafe.Add(pixelPointer, 3))
+				if a == 0 {
+					a = 255
+				}
+			default:
+				return nil, "", fmt.Errorf("unsupported bit count: %d", bitsPerPixel)
+			}
+
+			img.Set(x, y, color.RGBA{R: r, G: g, B: b, A: a})
+		}
+	}
+
+	imageBytes, err := ImageToBytes(img)
+	if err != nil {
+		return nil, "", err
+	}
+	return imageBytes, "", nil
+}
+
+func bytesToString(b []byte) string {
+	i := bytes.IndexByte(b, 0)
+	if i == -1 {
+		return string(b)
+	}
+	return string(b[:i])
+}

pkg/tui/image/images.go

@@ -0,0 +1,85 @@
+package image
+
+import (
+	"bytes"
+	"fmt"
+	"image"
+	"image/png"
+	"os"
+	"strings"
+
+	"github.com/charmbracelet/lipgloss"
+	"github.com/disintegration/imaging"
+	"github.com/lucasb-eyer/go-colorful"
+	_ "golang.org/x/image/webp"
+)
+
+func ValidateFileSize(filePath string, sizeLimit int64) (bool, error) {
+	fileInfo, err := os.Stat(filePath)
+	if err != nil {
+		return false, fmt.Errorf("error getting file info: %w", err)
+	}
+
+	if fileInfo.Size() > sizeLimit {
+		return true, nil
+	}
+
+	return false, nil
+}
+
+func ToString(width int, img image.Image) string {
+	img = imaging.Resize(img, width, 0, imaging.Lanczos)
+	b := img.Bounds()
+	imageWidth := b.Max.X
+	h := b.Max.Y
+	str := strings.Builder{}
+
+	for heightCounter := 0; heightCounter < h; heightCounter += 2 {
+		for x := range imageWidth {
+			c1, _ := colorful.MakeColor(img.At(x, heightCounter))
+			color1 := lipgloss.Color(c1.Hex())
+
+			var color2 lipgloss.Color
+			if heightCounter+1 < h {
+				c2, _ := colorful.MakeColor(img.At(x, heightCounter+1))
+				color2 = lipgloss.Color(c2.Hex())
+			} else {
+				color2 = color1
+			}
+
+			str.WriteString(lipgloss.NewStyle().Foreground(color1).
+				Background(color2).Render("▀"))
+		}
+
+		str.WriteString("\n")
+	}
+
+	return str.String()
+}
+
+func ImagePreview(width int, filename string) (string, error) {
+	imageContent, err := os.Open(filename)
+	if err != nil {
+		return "", err
+	}
+	defer imageContent.Close()
+
+	img, _, err := image.Decode(imageContent)
+	if err != nil {
+		return "", err
+	}
+
+	imageString := ToString(width, img)
+
+	return imageString, nil
+}
+
+func ImageToBytes(image image.Image) ([]byte, error) {
+	buf := new(bytes.Buffer)
+    err := png.Encode(buf, image)
+    if err != nil {
+        return nil, err
+    }
+    
+    return buf.Bytes(), nil
+}

pkg/tui/layout/container.go

@@ -0,0 +1,230 @@
+package layout
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type Container interface {
+	tea.Model
+	Sizeable
+	Bindings
+	Focus()
+	Blur()
+}
+
+type container struct {
+	width  int
+	height int
+
+	content tea.Model
+
+	paddingTop    int
+	paddingRight  int
+	paddingBottom int
+	paddingLeft   int
+
+	borderTop    bool
+	borderRight  bool
+	borderBottom bool
+	borderLeft   bool
+	borderStyle  lipgloss.Border
+
+	focused bool
+}
+
+func (c *container) Init() tea.Cmd {
+	return c.content.Init()
+}
+
+func (c *container) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	u, cmd := c.content.Update(msg)
+	c.content = u
+	return c, cmd
+}
+
+func (c *container) View() string {
+	t := theme.CurrentTheme()
+	style := lipgloss.NewStyle()
+	width := c.width
+	height := c.height
+
+	style = style.Background(t.Background())
+
+	// Apply border if any side is enabled
+	if c.borderTop || c.borderRight || c.borderBottom || c.borderLeft {
+		// Adjust width and height for borders
+		if c.borderTop {
+			height--
+		}
+		if c.borderBottom {
+			height--
+		}
+		if c.borderLeft {
+			width--
+		}
+		if c.borderRight {
+			width--
+		}
+		style = style.Border(c.borderStyle, c.borderTop, c.borderRight, c.borderBottom, c.borderLeft)
+
+		// Use primary color for border if focused
+		if c.focused {
+			style = style.BorderBackground(t.Background()).BorderForeground(t.Primary())
+		} else {
+			style = style.BorderBackground(t.Background()).BorderForeground(t.BorderNormal())
+		}
+	}
+	style = style.
+		Width(width).
+		Height(height).
+		PaddingTop(c.paddingTop).
+		PaddingRight(c.paddingRight).
+		PaddingBottom(c.paddingBottom).
+		PaddingLeft(c.paddingLeft)
+
+	return style.Render(c.content.View())
+}
+
+func (c *container) SetSize(width, height int) tea.Cmd {
+	c.width = width
+	c.height = height
+
+	// If the content implements Sizeable, adjust its size to account for padding and borders
+	if sizeable, ok := c.content.(Sizeable); ok {
+		// Calculate horizontal space taken by padding and borders
+		horizontalSpace := c.paddingLeft + c.paddingRight
+		if c.borderLeft {
+			horizontalSpace++
+		}
+		if c.borderRight {
+			horizontalSpace++
+		}
+
+		// Calculate vertical space taken by padding and borders
+		verticalSpace := c.paddingTop + c.paddingBottom
+		if c.borderTop {
+			verticalSpace++
+		}
+		if c.borderBottom {
+			verticalSpace++
+		}
+
+		// Set content size with adjusted dimensions
+		contentWidth := max(0, width-horizontalSpace)
+		contentHeight := max(0, height-verticalSpace)
+		return sizeable.SetSize(contentWidth, contentHeight)
+	}
+	return nil
+}
+
+func (c *container) GetSize() (int, int) {
+	return c.width, c.height
+}
+
+func (c *container) BindingKeys() []key.Binding {
+	if b, ok := c.content.(Bindings); ok {
+		return b.BindingKeys()
+	}
+	return []key.Binding{}
+}
+
+// Focus sets the container as focused
+func (c *container) Focus() {
+	c.focused = true
+	// Pass focus to content if it supports it
+	if focusable, ok := c.content.(interface{ Focus() }); ok {
+		focusable.Focus()
+	}
+}
+
+// Blur removes focus from the container
+func (c *container) Blur() {
+	c.focused = false
+	// Remove focus from content if it supports it
+	if blurable, ok := c.content.(interface{ Blur() }); ok {
+		blurable.Blur()
+	}
+}
+
+type ContainerOption func(*container)
+
+func NewContainer(content tea.Model, options ...ContainerOption) Container {
+	c := &container{
+		content:     content,
+		borderStyle: lipgloss.NormalBorder(),
+	}
+	for _, option := range options {
+		option(c)
+	}
+	return c
+}
+
+// Padding options
+func WithPadding(top, right, bottom, left int) ContainerOption {
+	return func(c *container) {
+		c.paddingTop = top
+		c.paddingRight = right
+		c.paddingBottom = bottom
+		c.paddingLeft = left
+	}
+}
+
+func WithPaddingAll(padding int) ContainerOption {
+	return WithPadding(padding, padding, padding, padding)
+}
+
+func WithPaddingHorizontal(padding int) ContainerOption {
+	return func(c *container) {
+		c.paddingLeft = padding
+		c.paddingRight = padding
+	}
+}
+
+func WithPaddingVertical(padding int) ContainerOption {
+	return func(c *container) {
+		c.paddingTop = padding
+		c.paddingBottom = padding
+	}
+}
+
+func WithBorder(top, right, bottom, left bool) ContainerOption {
+	return func(c *container) {
+		c.borderTop = top
+		c.borderRight = right
+		c.borderBottom = bottom
+		c.borderLeft = left
+	}
+}
+
+func WithBorderAll() ContainerOption {
+	return WithBorder(true, true, true, true)
+}
+
+func WithBorderHorizontal() ContainerOption {
+	return WithBorder(true, false, true, false)
+}
+
+func WithBorderVertical() ContainerOption {
+	return WithBorder(false, true, false, true)
+}
+
+func WithBorderStyle(style lipgloss.Border) ContainerOption {
+	return func(c *container) {
+		c.borderStyle = style
+	}
+}
+
+func WithRoundedBorder() ContainerOption {
+	return WithBorderStyle(lipgloss.RoundedBorder())
+}
+
+func WithThickBorder() ContainerOption {
+	return WithBorderStyle(lipgloss.ThickBorder())
+}
+
+func WithDoubleBorder() ContainerOption {
+	return WithBorderStyle(lipgloss.DoubleBorder())
+}

pkg/tui/layout/layout.go

@@ -0,0 +1,35 @@
+package layout
+
+import (
+	"reflect"
+
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+)
+
+type Focusable interface {
+	Focus() tea.Cmd
+	Blur() tea.Cmd
+	IsFocused() bool
+}
+
+type Sizeable interface {
+	SetSize(width, height int) tea.Cmd
+	GetSize() (int, int)
+}
+
+type Bindings interface {
+	BindingKeys() []key.Binding
+}
+
+func KeyMapToSlice(t any) (bindings []key.Binding) {
+	typ := reflect.TypeOf(t)
+	if typ.Kind() != reflect.Struct {
+		return nil
+	}
+	for i := range typ.NumField() {
+		v := reflect.ValueOf(t).Field(i)
+		bindings = append(bindings, v.Interface().(key.Binding))
+	}
+	return
+}

pkg/tui/layout/overlay.go

@@ -0,0 +1,169 @@
+package layout
+
+import (
+	"strings"
+
+	"github.com/charmbracelet/lipgloss"
+	chAnsi "github.com/charmbracelet/x/ansi"
+	"github.com/muesli/ansi"
+	"github.com/muesli/reflow/truncate"
+	"github.com/muesli/termenv"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+// Most of this code is borrowed from
+// https://github.com/charmbracelet/lipgloss/pull/102
+// as well as the lipgloss library, with some modification for what I needed.
+
+// Split a string into lines, additionally returning the size of the widest
+// line.
+func getLines(s string) (lines []string, widest int) {
+	lines = strings.Split(s, "\n")
+
+	for _, l := range lines {
+		w := ansi.PrintableRuneWidth(l)
+		if widest < w {
+			widest = w
+		}
+	}
+
+	return lines, widest
+}
+
+// PlaceOverlay places fg on top of bg.
+func PlaceOverlay(
+	x, y int,
+	fg, bg string,
+	shadow bool, opts ...WhitespaceOption,
+) string {
+	fgLines, fgWidth := getLines(fg)
+	bgLines, bgWidth := getLines(bg)
+	bgHeight := len(bgLines)
+	fgHeight := len(fgLines)
+
+	if shadow {
+		t := theme.CurrentTheme()
+		baseStyle := styles.BaseStyle()
+
+		var shadowbg string = ""
+		shadowchar := lipgloss.NewStyle().
+			Background(t.BackgroundDarker()).
+			Foreground(t.Background()).
+			Render("░")
+		bgchar := baseStyle.Render(" ")
+		for i := 0; i <= fgHeight; i++ {
+			if i == 0 {
+				shadowbg += bgchar + strings.Repeat(bgchar, fgWidth) + "\n"
+			} else {
+				shadowbg += bgchar + strings.Repeat(shadowchar, fgWidth) + "\n"
+			}
+		}
+
+		fg = PlaceOverlay(0, 0, fg, shadowbg, false, opts...)
+		fgLines, fgWidth = getLines(fg)
+		fgHeight = len(fgLines)
+	}
+
+	if fgWidth >= bgWidth && fgHeight >= bgHeight {
+		// FIXME: return fg or bg?
+		return fg
+	}
+	// TODO: allow placement outside of the bg box?
+	x = util.Clamp(x, 0, bgWidth-fgWidth)
+	y = util.Clamp(y, 0, bgHeight-fgHeight)
+
+	ws := &whitespace{}
+	for _, opt := range opts {
+		opt(ws)
+	}
+
+	var b strings.Builder
+	for i, bgLine := range bgLines {
+		if i > 0 {
+			b.WriteByte('\n')
+		}
+		if i < y || i >= y+fgHeight {
+			b.WriteString(bgLine)
+			continue
+		}
+
+		pos := 0
+		if x > 0 {
+			left := truncate.String(bgLine, uint(x))
+			pos = ansi.PrintableRuneWidth(left)
+			b.WriteString(left)
+			if pos < x {
+				b.WriteString(ws.render(x - pos))
+				pos = x
+			}
+		}
+
+		fgLine := fgLines[i-y]
+		b.WriteString(fgLine)
+		pos += ansi.PrintableRuneWidth(fgLine)
+
+		right := cutLeft(bgLine, pos)
+		bgWidth := ansi.PrintableRuneWidth(bgLine)
+		rightWidth := ansi.PrintableRuneWidth(right)
+		if rightWidth <= bgWidth-pos {
+			b.WriteString(ws.render(bgWidth - rightWidth - pos))
+		}
+
+		b.WriteString(right)
+	}
+
+	return b.String()
+}
+
+// cutLeft cuts printable characters from the left.
+// This function is heavily based on muesli's ansi and truncate packages.
+func cutLeft(s string, cutWidth int) string {
+	return chAnsi.Cut(s, cutWidth, lipgloss.Width(s))
+}
+
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+type whitespace struct {
+	style termenv.Style
+	chars string
+}
+
+// Render whitespaces.
+func (w whitespace) render(width int) string {
+	if w.chars == "" {
+		w.chars = " "
+	}
+
+	r := []rune(w.chars)
+	j := 0
+	b := strings.Builder{}
+
+	// Cycle through runes and print them into the whitespace.
+	for i := 0; i < width; {
+		b.WriteRune(r[j])
+		j++
+		if j >= len(r) {
+			j = 0
+		}
+		i += ansi.PrintableRuneWidth(string(r[j]))
+	}
+
+	// Fill any extra gaps white spaces. This might be necessary if any runes
+	// are more than one cell wide, which could leave a one-rune gap.
+	short := width - ansi.PrintableRuneWidth(b.String())
+	if short > 0 {
+		b.WriteString(strings.Repeat(" ", short))
+	}
+
+	return w.style.Styled(b.String())
+}
+
+// WhitespaceOption sets a styling rule for rendering whitespace.
+type WhitespaceOption func(*whitespace)

pkg/tui/layout/split.go

@@ -0,0 +1,283 @@
+package layout
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+type SplitPaneLayout interface {
+	tea.Model
+	Sizeable
+	Bindings
+	SetLeftPanel(panel Container) tea.Cmd
+	SetRightPanel(panel Container) tea.Cmd
+	SetBottomPanel(panel Container) tea.Cmd
+
+	ClearLeftPanel() tea.Cmd
+	ClearRightPanel() tea.Cmd
+	ClearBottomPanel() tea.Cmd
+}
+
+type splitPaneLayout struct {
+	width         int
+	height        int
+	ratio         float64
+	verticalRatio float64
+
+	rightPanel  Container
+	leftPanel   Container
+	bottomPanel Container
+}
+
+type SplitPaneOption func(*splitPaneLayout)
+
+func (s *splitPaneLayout) Init() tea.Cmd {
+	var cmds []tea.Cmd
+
+	if s.leftPanel != nil {
+		cmds = append(cmds, s.leftPanel.Init())
+	}
+
+	if s.rightPanel != nil {
+		cmds = append(cmds, s.rightPanel.Init())
+	}
+
+	if s.bottomPanel != nil {
+		cmds = append(cmds, s.bottomPanel.Init())
+	}
+
+	return tea.Batch(cmds...)
+}
+
+func (s *splitPaneLayout) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		return s, s.SetSize(msg.Width, msg.Height)
+	}
+
+	if s.rightPanel != nil {
+		u, cmd := s.rightPanel.Update(msg)
+		s.rightPanel = u.(Container)
+		if cmd != nil {
+			cmds = append(cmds, cmd)
+		}
+	}
+
+	if s.leftPanel != nil {
+		u, cmd := s.leftPanel.Update(msg)
+		s.leftPanel = u.(Container)
+		if cmd != nil {
+			cmds = append(cmds, cmd)
+		}
+	}
+
+	if s.bottomPanel != nil {
+		u, cmd := s.bottomPanel.Update(msg)
+		s.bottomPanel = u.(Container)
+		if cmd != nil {
+			cmds = append(cmds, cmd)
+		}
+	}
+
+	return s, tea.Batch(cmds...)
+}
+
+func (s *splitPaneLayout) View() string {
+	var topSection string
+
+	if s.leftPanel != nil && s.rightPanel != nil {
+		leftView := s.leftPanel.View()
+		rightView := s.rightPanel.View()
+		topSection = lipgloss.JoinHorizontal(lipgloss.Top, leftView, rightView)
+	} else if s.leftPanel != nil {
+		topSection = s.leftPanel.View()
+	} else if s.rightPanel != nil {
+		topSection = s.rightPanel.View()
+	} else {
+		topSection = ""
+	}
+
+	var finalView string
+
+	if s.bottomPanel != nil && topSection != "" {
+		bottomView := s.bottomPanel.View()
+		finalView = lipgloss.JoinVertical(lipgloss.Left, topSection, bottomView)
+	} else if s.bottomPanel != nil {
+		finalView = s.bottomPanel.View()
+	} else {
+		finalView = topSection
+	}
+
+	if finalView != "" {
+		t := theme.CurrentTheme()
+
+		style := lipgloss.NewStyle().
+			Width(s.width).
+			Height(s.height).
+			Background(t.Background())
+
+		return style.Render(finalView)
+	}
+
+	return finalView
+}
+
+func (s *splitPaneLayout) SetSize(width, height int) tea.Cmd {
+	s.width = width
+	s.height = height
+
+	var topHeight, bottomHeight int
+	if s.bottomPanel != nil {
+		topHeight = int(float64(height) * s.verticalRatio)
+		bottomHeight = height - topHeight
+	} else {
+		topHeight = height
+		bottomHeight = 0
+	}
+
+	var leftWidth, rightWidth int
+	if s.leftPanel != nil && s.rightPanel != nil {
+		leftWidth = int(float64(width) * s.ratio)
+		rightWidth = width - leftWidth
+	} else if s.leftPanel != nil {
+		leftWidth = width
+		rightWidth = 0
+	} else if s.rightPanel != nil {
+		leftWidth = 0
+		rightWidth = width
+	}
+
+	var cmds []tea.Cmd
+	if s.leftPanel != nil {
+		cmd := s.leftPanel.SetSize(leftWidth, topHeight)
+		cmds = append(cmds, cmd)
+	}
+
+	if s.rightPanel != nil {
+		cmd := s.rightPanel.SetSize(rightWidth, topHeight)
+		cmds = append(cmds, cmd)
+	}
+
+	if s.bottomPanel != nil {
+		cmd := s.bottomPanel.SetSize(width, bottomHeight)
+		cmds = append(cmds, cmd)
+	}
+	return tea.Batch(cmds...)
+}
+
+func (s *splitPaneLayout) GetSize() (int, int) {
+	return s.width, s.height
+}
+
+func (s *splitPaneLayout) SetLeftPanel(panel Container) tea.Cmd {
+	s.leftPanel = panel
+	if s.width > 0 && s.height > 0 {
+		return s.SetSize(s.width, s.height)
+	}
+	return nil
+}
+
+func (s *splitPaneLayout) SetRightPanel(panel Container) tea.Cmd {
+	s.rightPanel = panel
+	if s.width > 0 && s.height > 0 {
+		return s.SetSize(s.width, s.height)
+	}
+	return nil
+}
+
+func (s *splitPaneLayout) SetBottomPanel(panel Container) tea.Cmd {
+	s.bottomPanel = panel
+	if s.width > 0 && s.height > 0 {
+		return s.SetSize(s.width, s.height)
+	}
+	return nil
+}
+
+func (s *splitPaneLayout) ClearLeftPanel() tea.Cmd {
+	s.leftPanel = nil
+	if s.width > 0 && s.height > 0 {
+		return s.SetSize(s.width, s.height)
+	}
+	return nil
+}
+
+func (s *splitPaneLayout) ClearRightPanel() tea.Cmd {
+	s.rightPanel = nil
+	if s.width > 0 && s.height > 0 {
+		return s.SetSize(s.width, s.height)
+	}
+	return nil
+}
+
+func (s *splitPaneLayout) ClearBottomPanel() tea.Cmd {
+	s.bottomPanel = nil
+	if s.width > 0 && s.height > 0 {
+		return s.SetSize(s.width, s.height)
+	}
+	return nil
+}
+
+func (s *splitPaneLayout) BindingKeys() []key.Binding {
+	keys := []key.Binding{}
+	if s.leftPanel != nil {
+		if b, ok := s.leftPanel.(Bindings); ok {
+			keys = append(keys, b.BindingKeys()...)
+		}
+	}
+	if s.rightPanel != nil {
+		if b, ok := s.rightPanel.(Bindings); ok {
+			keys = append(keys, b.BindingKeys()...)
+		}
+	}
+	if s.bottomPanel != nil {
+		if b, ok := s.bottomPanel.(Bindings); ok {
+			keys = append(keys, b.BindingKeys()...)
+		}
+	}
+	return keys
+}
+
+func NewSplitPane(options ...SplitPaneOption) SplitPaneLayout {
+
+	layout := &splitPaneLayout{
+		ratio:         0.7,
+		verticalRatio: 0.9, // Default 90% for top section, 10% for bottom
+	}
+	for _, option := range options {
+		option(layout)
+	}
+	return layout
+}
+
+func WithLeftPanel(panel Container) SplitPaneOption {
+	return func(s *splitPaneLayout) {
+		s.leftPanel = panel
+	}
+}
+
+func WithRightPanel(panel Container) SplitPaneOption {
+	return func(s *splitPaneLayout) {
+		s.rightPanel = panel
+	}
+}
+
+func WithRatio(ratio float64) SplitPaneOption {
+	return func(s *splitPaneLayout) {
+		s.ratio = ratio
+	}
+}
+
+func WithBottomPanel(panel Container) SplitPaneOption {
+	return func(s *splitPaneLayout) {
+		s.bottomPanel = panel
+	}
+}
+
+func WithVerticalRatio(ratio float64) SplitPaneOption {
+	return func(s *splitPaneLayout) {
+		s.verticalRatio = ratio
+	}
+}

pkg/tui/page/chat.go

@@ -0,0 +1,263 @@
+package page
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/completions"
+	"github.com/sst/opencode/internal/message"
+	"github.com/sst/opencode/internal/session"
+	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/tui/components/chat"
+	"github.com/sst/opencode/internal/tui/components/dialog"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/state"
+	"github.com/sst/opencode/internal/tui/util"
+)
+
+var ChatPage PageID = "chat"
+
+type chatPage struct {
+	app                  *app.App
+	editor               layout.Container
+	messages             layout.Container
+	layout               layout.SplitPaneLayout
+	completionDialog     dialog.CompletionDialog
+	showCompletionDialog bool
+}
+
+type ChatKeyMap struct {
+	NewSession           key.Binding
+	Cancel               key.Binding
+	ToggleTools          key.Binding
+	ShowCompletionDialog key.Binding
+}
+
+var keyMap = ChatKeyMap{
+	NewSession: key.NewBinding(
+		key.WithKeys("ctrl+n"),
+		key.WithHelp("ctrl+n", "new session"),
+	),
+	Cancel: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "cancel"),
+	),
+	ToggleTools: key.NewBinding(
+		key.WithKeys("ctrl+h"),
+		key.WithHelp("ctrl+h", "toggle tools"),
+	),
+	ShowCompletionDialog: key.NewBinding(
+		key.WithKeys("/"),
+		key.WithHelp("/", "Complete"),
+	),
+}
+
+func (p *chatPage) Init() tea.Cmd {
+	cmds := []tea.Cmd{
+		p.layout.Init(),
+	}
+	cmds = append(cmds, p.completionDialog.Init())
+	return tea.Batch(cmds...)
+}
+
+func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		cmd := p.layout.SetSize(msg.Width, msg.Height)
+		cmds = append(cmds, cmd)
+	case chat.SendMsg:
+		cmd := p.sendMessage(msg.Text, msg.Attachments)
+		if cmd != nil {
+			return p, cmd
+		}
+	case dialog.CommandRunCustomMsg:
+		// Check if the agent is busy before executing custom commands
+		if p.app.PrimaryAgent.IsBusy() {
+			status.Warn("Agent is busy, please wait before executing a command...")
+			return p, nil
+		}
+
+		// Process the command content with arguments if any
+		content := msg.Content
+		if msg.Args != nil {
+			// Replace all named arguments with their values
+			for name, value := range msg.Args {
+				placeholder := "$" + name
+				content = strings.ReplaceAll(content, placeholder, value)
+			}
+		}
+
+		// Handle custom command execution
+		cmd := p.sendMessage(content, nil)
+		if cmd != nil {
+			return p, cmd
+		}
+	case state.SessionSelectedMsg:
+		cmd := p.setSidebar()
+		cmds = append(cmds, cmd)
+	case state.SessionClearedMsg:
+		cmd := p.setSidebar()
+		cmds = append(cmds, cmd)
+	case state.CompactSessionMsg:
+		if p.app.CurrentSession.ID == "" {
+			status.Warn("No active session to compact.")
+			return p, nil
+		}
+
+		// Run compaction in background
+		go func(sessionID string) {
+			err := p.app.PrimaryAgent.CompactSession(context.Background(), sessionID, false)
+			if err != nil {
+				status.Error(fmt.Sprintf("Compaction failed: %v", err))
+			} else {
+				status.Info("Conversation compacted successfully.")
+			}
+		}(p.app.CurrentSession.ID)
+
+		return p, nil
+	case dialog.CompletionDialogCloseMsg:
+		p.showCompletionDialog = false
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, keyMap.ShowCompletionDialog):
+			p.showCompletionDialog = true
+			// Continue sending keys to layout->chat
+		case key.Matches(msg, keyMap.NewSession):
+			p.app.CurrentSession = &session.Session{}
+			return p, tea.Batch(
+				p.clearSidebar(),
+				util.CmdHandler(state.SessionClearedMsg{}),
+			)
+		case key.Matches(msg, keyMap.Cancel):
+			if p.app.CurrentSession.ID != "" {
+				// Cancel the current session's generation process
+				// This allows users to interrupt long-running operations
+				p.app.PrimaryAgent.Cancel(p.app.CurrentSession.ID)
+				return p, nil
+			}
+		case key.Matches(msg, keyMap.ToggleTools):
+			return p, util.CmdHandler(chat.ToggleToolMessagesMsg{})
+		}
+	}
+	if p.showCompletionDialog {
+		context, contextCmd := p.completionDialog.Update(msg)
+		p.completionDialog = context.(dialog.CompletionDialog)
+		cmds = append(cmds, contextCmd)
+
+		// Doesn't forward event if enter key is pressed
+		if keyMsg, ok := msg.(tea.KeyMsg); ok {
+			if keyMsg.String() == "enter" {
+				return p, tea.Batch(cmds...)
+			}
+		}
+	}
+
+	u, cmd := p.layout.Update(msg)
+	cmds = append(cmds, cmd)
+	p.layout = u.(layout.SplitPaneLayout)
+	return p, tea.Batch(cmds...)
+}
+
+func (p *chatPage) setSidebar() tea.Cmd {
+	sidebarContainer := layout.NewContainer(
+		chat.NewSidebarCmp(p.app),
+		layout.WithPadding(1, 1, 1, 1),
+	)
+	return tea.Batch(p.layout.SetRightPanel(sidebarContainer), sidebarContainer.Init())
+}
+
+func (p *chatPage) clearSidebar() tea.Cmd {
+	return p.layout.ClearRightPanel()
+}
+
+func (p *chatPage) sendMessage(text string, attachments []message.Attachment) tea.Cmd {
+	var cmds []tea.Cmd
+	if p.app.CurrentSession.ID == "" {
+		newSession, err := p.app.Sessions.Create(context.Background(), "New Session")
+		if err != nil {
+			status.Error(err.Error())
+			return nil
+		}
+
+		p.app.CurrentSession = &newSession
+
+		cmd := p.setSidebar()
+		if cmd != nil {
+			cmds = append(cmds, cmd)
+		}
+		cmds = append(cmds, util.CmdHandler(state.SessionSelectedMsg(&newSession)))
+	}
+
+	_, err := p.app.PrimaryAgent.Run(context.Background(), p.app.CurrentSession.ID, text, attachments...)
+	if err != nil {
+		status.Error(err.Error())
+		return nil
+	}
+	return tea.Batch(cmds...)
+}
+
+func (p *chatPage) SetSize(width, height int) tea.Cmd {
+	return p.layout.SetSize(width, height)
+}
+
+func (p *chatPage) GetSize() (int, int) {
+	return p.layout.GetSize()
+}
+
+func (p *chatPage) View() string {
+	layoutView := p.layout.View()
+
+	if p.showCompletionDialog {
+		_, layoutHeight := p.layout.GetSize()
+		editorWidth, editorHeight := p.editor.GetSize()
+
+		p.completionDialog.SetWidth(editorWidth)
+		overlay := p.completionDialog.View()
+
+		layoutView = layout.PlaceOverlay(
+			0,
+			layoutHeight-editorHeight-lipgloss.Height(overlay),
+			overlay,
+			layoutView,
+			false,
+		)
+	}
+
+	return layoutView
+}
+
+func (p *chatPage) BindingKeys() []key.Binding {
+	bindings := layout.KeyMapToSlice(keyMap)
+	bindings = append(bindings, p.messages.BindingKeys()...)
+	bindings = append(bindings, p.editor.BindingKeys()...)
+	return bindings
+}
+
+func NewChatPage(app *app.App) tea.Model {
+	cg := completions.NewFileAndFolderContextGroup()
+	completionDialog := dialog.NewCompletionDialogCmp(cg)
+	messagesContainer := layout.NewContainer(
+		chat.NewMessagesCmp(app),
+		layout.WithPadding(1, 1, 0, 1),
+	)
+	editorContainer := layout.NewContainer(
+		chat.NewEditorCmp(app),
+		layout.WithBorder(true, false, false, false),
+	)
+	return &chatPage{
+		app:              app,
+		editor:           editorContainer,
+		messages:         messagesContainer,
+		completionDialog: completionDialog,
+		layout: layout.NewSplitPane(
+			layout.WithLeftPanel(messagesContainer),
+			layout.WithBottomPanel(editorContainer),
+		),
+	}
+}

pkg/tui/page/logs.go

@@ -0,0 +1,224 @@
+package page
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/tui/components/logs"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/styles"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+var LogsPage PageID = "logs"
+
+type LogPage interface {
+	tea.Model
+	layout.Sizeable
+	layout.Bindings
+}
+
+// Custom keybindings for logs page
+type logsKeyMap struct {
+	Left  key.Binding
+	Right key.Binding
+	Tab   key.Binding
+}
+
+var logsKeys = logsKeyMap{
+	Left: key.NewBinding(
+		key.WithKeys("left", "h"),
+		key.WithHelp("←/h", "left pane"),
+	),
+	Right: key.NewBinding(
+		key.WithKeys("right", "l"),
+		key.WithHelp("→/l", "right pane"),
+	),
+	Tab: key.NewBinding(
+		key.WithKeys("tab"),
+		key.WithHelp("tab", "switch panes"),
+	),
+}
+
+type logsPage struct {
+	width, height int
+	table         layout.Container
+	details       layout.Container
+	activePane    int // 0 = table, 1 = details
+	keyMap        logsKeyMap
+}
+
+// Message to switch active pane
+type switchPaneMsg struct {
+	pane int // 0 = table, 1 = details
+}
+
+func (p *logsPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		p.width = msg.Width
+		p.height = msg.Height
+		return p, p.SetSize(msg.Width, msg.Height)
+	case switchPaneMsg:
+		p.activePane = msg.pane
+		if p.activePane == 0 {
+			p.table.Focus()
+			p.details.Blur()
+		} else {
+			p.table.Blur()
+			p.details.Focus()
+		}
+		return p, nil
+	case tea.KeyMsg:
+		// Handle navigation keys
+		switch {
+		case key.Matches(msg, p.keyMap.Left):
+			return p, func() tea.Msg {
+				return switchPaneMsg{pane: 0}
+			}
+		case key.Matches(msg, p.keyMap.Right):
+			return p, func() tea.Msg {
+				return switchPaneMsg{pane: 1}
+			}
+		case key.Matches(msg, p.keyMap.Tab):
+			return p, func() tea.Msg {
+				return switchPaneMsg{pane: (p.activePane + 1) % 2}
+			}
+		}
+	}
+
+	// Update the active pane first to handle keyboard input
+	if p.activePane == 0 {
+		table, cmd := p.table.Update(msg)
+		cmds = append(cmds, cmd)
+		p.table = table.(layout.Container)
+
+		// Update details pane without focus
+		details, cmd := p.details.Update(msg)
+		cmds = append(cmds, cmd)
+		p.details = details.(layout.Container)
+	} else {
+		details, cmd := p.details.Update(msg)
+		cmds = append(cmds, cmd)
+		p.details = details.(layout.Container)
+
+		// Update table pane without focus
+		table, cmd := p.table.Update(msg)
+		cmds = append(cmds, cmd)
+		p.table = table.(layout.Container)
+	}
+
+	return p, tea.Batch(cmds...)
+}
+
+func (p *logsPage) View() string {
+	t := theme.CurrentTheme()
+
+	// Add padding to the right of the table view
+	tableView := lipgloss.NewStyle().PaddingRight(3).Render(p.table.View())
+
+	// Add border to the active pane
+	tableStyle := lipgloss.NewStyle()
+	detailsStyle := lipgloss.NewStyle()
+
+	if p.activePane == 0 {
+		tableStyle = tableStyle.BorderForeground(t.Primary())
+	} else {
+		detailsStyle = detailsStyle.BorderForeground(t.Primary())
+	}
+
+	tableView = tableStyle.Render(tableView)
+	detailsView := detailsStyle.Render(p.details.View())
+
+	return styles.ForceReplaceBackgroundWithLipgloss(
+		lipgloss.JoinVertical(
+			lipgloss.Left,
+			styles.Bold().Render(" esc")+styles.Muted().Render(" to go back")+
+				"  "+styles.Bold().Render(" tab/←→/h/l")+styles.Muted().Render(" to switch panes"),
+			"",
+			lipgloss.JoinHorizontal(lipgloss.Top,
+				tableView,
+				detailsView,
+			),
+			"",
+		),
+		t.Background(),
+	)
+}
+
+func (p *logsPage) BindingKeys() []key.Binding {
+	// Add our custom keybindings
+	bindings := []key.Binding{
+		p.keyMap.Left,
+		p.keyMap.Right,
+		p.keyMap.Tab,
+	}
+
+	// Add the active pane's keybindings
+	if p.activePane == 0 {
+		bindings = append(bindings, p.table.BindingKeys()...)
+	} else {
+		bindings = append(bindings, p.details.BindingKeys()...)
+	}
+
+	return bindings
+}
+
+// GetSize implements LogPage.
+func (p *logsPage) GetSize() (int, int) {
+	return p.width, p.height
+}
+
+// SetSize implements LogPage.
+func (p *logsPage) SetSize(width int, height int) tea.Cmd {
+	p.width = width
+	p.height = height
+
+	// Account for padding between panes (3 characters)
+	const padding = 3
+	leftPaneWidth := (width - padding) / 2
+	rightPaneWidth := width - leftPaneWidth - padding
+
+	return tea.Batch(
+		p.table.SetSize(leftPaneWidth, height-3),
+		p.details.SetSize(rightPaneWidth, height-3),
+	)
+}
+
+func (p *logsPage) Init() tea.Cmd {
+	// Start with table pane active
+	p.activePane = 0
+	p.table.Focus()
+	p.details.Blur()
+
+	// Force an initial selection to update the details pane
+	var cmds []tea.Cmd
+	cmds = append(cmds, p.table.Init())
+	cmds = append(cmds, p.details.Init())
+
+	// Send a key down and then key up to select the first row
+	// This ensures the details pane is populated when returning to the logs page
+	cmds = append(cmds, func() tea.Msg {
+		return tea.KeyMsg{Type: tea.KeyDown}
+	})
+	cmds = append(cmds, func() tea.Msg {
+		return tea.KeyMsg{Type: tea.KeyUp}
+	})
+
+	return tea.Batch(cmds...)
+}
+
+func NewLogsPage(app *app.App) tea.Model {
+	// Create containers with borders to visually indicate active pane
+	tableContainer := layout.NewContainer(logs.NewLogsTable(app), layout.WithBorderHorizontal())
+	detailsContainer := layout.NewContainer(logs.NewLogsDetails(), layout.WithBorderHorizontal())
+
+	return &logsPage{
+		table:      tableContainer,
+		details:    detailsContainer,
+		activePane: 0, // Start with table pane active
+		keyMap:     logsKeys,
+	}
+}

pkg/tui/page/page.go

@@ -0,0 +1,8 @@
+package page
+
+type PageID string
+
+// PageChangeMsg is used to change the current page
+type PageChangeMsg struct {
+	ID PageID
+}

pkg/tui/state/state.go

@@ -0,0 +1,7 @@
+package state
+
+import "github.com/sst/opencode/internal/session"
+
+type SessionSelectedMsg = *session.Session
+type SessionClearedMsg struct{}
+type CompactSessionMsg struct{}

pkg/tui/styles/background.go

@@ -0,0 +1,123 @@
+package styles
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+
+	"github.com/charmbracelet/lipgloss"
+)
+
+var ansiEscape = regexp.MustCompile("\x1b\\[[0-9;]*m")
+
+func getColorRGB(c lipgloss.TerminalColor) (uint8, uint8, uint8) {
+	r, g, b, a := c.RGBA()
+
+	// Un-premultiply alpha if needed
+	if a > 0 && a < 0xffff {
+		r = (r * 0xffff) / a
+		g = (g * 0xffff) / a
+		b = (b * 0xffff) / a
+	}
+
+	// Convert from 16-bit to 8-bit color
+	return uint8(r >> 8), uint8(g >> 8), uint8(b >> 8)
+}
+
+// ForceReplaceBackgroundWithLipgloss replaces any ANSI background color codes
+// in `input` with a single 24‑bit background (48;2;R;G;B).
+func ForceReplaceBackgroundWithLipgloss(input string, newBgColor lipgloss.TerminalColor) string {
+	// Precompute our new-bg sequence once
+	r, g, b := getColorRGB(newBgColor)
+	newBg := fmt.Sprintf("48;2;%d;%d;%d", r, g, b)
+
+	return ansiEscape.ReplaceAllStringFunc(input, func(seq string) string {
+		const (
+			escPrefixLen = 2 // "\x1b["
+			escSuffixLen = 1 // "m"
+		)
+
+		raw := seq
+		start := escPrefixLen
+		end := len(raw) - escSuffixLen
+
+		var sb strings.Builder
+		// reserve enough space: original content minus bg codes + our newBg
+		sb.Grow((end - start) + len(newBg) + 2)
+
+		// scan from start..end, token by token
+		for i := start; i < end; {
+			// find the next ';' or end
+			j := i
+			for j < end && raw[j] != ';' {
+				j++
+			}
+			token := raw[i:j]
+
+			// fast‑path: skip "48;5;N" or "48;2;R;G;B"
+			if len(token) == 2 && token[0] == '4' && token[1] == '8' {
+				k := j + 1
+				if k < end {
+					// find next token
+					l := k
+					for l < end && raw[l] != ';' {
+						l++
+					}
+					next := raw[k:l]
+					if next == "5" {
+						// skip "48;5;N"
+						m := l + 1
+						for m < end && raw[m] != ';' {
+							m++
+						}
+						i = m + 1
+						continue
+					} else if next == "2" {
+						// skip "48;2;R;G;B"
+						m := l + 1
+						for count := 0; count < 3 && m < end; count++ {
+							for m < end && raw[m] != ';' {
+								m++
+							}
+							m++
+						}
+						i = m
+						continue
+					}
+				}
+			}
+
+			// decide whether to keep this token
+			// manually parse ASCII digits to int
+			isNum := true
+			val := 0
+			for p := i; p < j; p++ {
+				c := raw[p]
+				if c < '0' || c > '9' {
+					isNum = false
+					break
+				}
+				val = val*10 + int(c-'0')
+			}
+			keep := !isNum ||
+				((val < 40 || val > 47) && (val < 100 || val > 107) && val != 49)
+
+			if keep {
+				if sb.Len() > 0 {
+					sb.WriteByte(';')
+				}
+				sb.WriteString(token)
+			}
+			// advance past this token (and the semicolon)
+			i = j + 1
+		}
+
+		// append our new background
+		if sb.Len() > 0 {
+			sb.WriteByte(';')
+		}
+		sb.WriteString(newBg)
+
+		return "\x1b[" + sb.String() + "m"
+	})
+}

pkg/tui/styles/icons.go

@@ -0,0 +1,12 @@
+package styles
+
+const (
+	OpenCodeIcon string = "ⓒ"
+
+	ErrorIcon    string = "ⓔ"
+	WarningIcon  string = "ⓦ"
+	InfoIcon     string = "ⓘ"
+	HintIcon     string = "ⓗ"
+	SpinnerIcon  string = "⟳"
+	DocumentIcon string = "🖼"
+)

pkg/tui/styles/markdown.go

@@ -0,0 +1,284 @@
+package styles
+
+import (
+	"github.com/charmbracelet/glamour"
+	"github.com/charmbracelet/glamour/ansi"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+const defaultMargin = 1
+
+// Helper functions for style pointers
+func boolPtr(b bool) *bool       { return &b }
+func stringPtr(s string) *string { return &s }
+func uintPtr(u uint) *uint       { return &u }
+
+// returns a glamour TermRenderer configured with the current theme
+func GetMarkdownRenderer(width int) *glamour.TermRenderer {
+	r, _ := glamour.NewTermRenderer(
+		glamour.WithStyles(generateMarkdownStyleConfig()),
+		glamour.WithWordWrap(width),
+	)
+	return r
+}
+
+// creates an ansi.StyleConfig for markdown rendering
+// using adaptive colors from the provided theme.
+func generateMarkdownStyleConfig() ansi.StyleConfig {
+	t := theme.CurrentTheme()
+
+	return ansi.StyleConfig{
+		Document: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				BlockPrefix: "",
+				BlockSuffix: "",
+				Color:       stringPtr(adaptiveColorToString(t.MarkdownText())),
+			},
+			Margin: uintPtr(defaultMargin),
+		},
+		BlockQuote: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Color:  stringPtr(adaptiveColorToString(t.MarkdownBlockQuote())),
+				Italic: boolPtr(true),
+				Prefix: "┃ ",
+			},
+			Indent:      uintPtr(1),
+			IndentToken: stringPtr(BaseStyle().Render(" ")),
+		},
+		List: ansi.StyleList{
+			LevelIndent: defaultMargin,
+			StyleBlock: ansi.StyleBlock{
+				IndentToken: stringPtr(BaseStyle().Render(" ")),
+				StylePrimitive: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.MarkdownText())),
+				},
+			},
+		},
+		Heading: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				BlockSuffix: "\n",
+				Color:       stringPtr(adaptiveColorToString(t.MarkdownHeading())),
+				Bold:        boolPtr(true),
+			},
+		},
+		H1: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Prefix: "# ",
+				Color:  stringPtr(adaptiveColorToString(t.MarkdownHeading())),
+				Bold:   boolPtr(true),
+			},
+		},
+		H2: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Prefix: "## ",
+				Color:  stringPtr(adaptiveColorToString(t.MarkdownHeading())),
+				Bold:   boolPtr(true),
+			},
+		},
+		H3: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Prefix: "### ",
+				Color:  stringPtr(adaptiveColorToString(t.MarkdownHeading())),
+				Bold:   boolPtr(true),
+			},
+		},
+		H4: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Prefix: "#### ",
+				Color:  stringPtr(adaptiveColorToString(t.MarkdownHeading())),
+				Bold:   boolPtr(true),
+			},
+		},
+		H5: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Prefix: "##### ",
+				Color:  stringPtr(adaptiveColorToString(t.MarkdownHeading())),
+				Bold:   boolPtr(true),
+			},
+		},
+		H6: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Prefix: "###### ",
+				Color:  stringPtr(adaptiveColorToString(t.MarkdownHeading())),
+				Bold:   boolPtr(true),
+			},
+		},
+		Strikethrough: ansi.StylePrimitive{
+			CrossedOut: boolPtr(true),
+			Color:      stringPtr(adaptiveColorToString(t.TextMuted())),
+		},
+		Emph: ansi.StylePrimitive{
+			Color:  stringPtr(adaptiveColorToString(t.MarkdownEmph())),
+			Italic: boolPtr(true),
+		},
+		Strong: ansi.StylePrimitive{
+			Bold:  boolPtr(true),
+			Color: stringPtr(adaptiveColorToString(t.MarkdownStrong())),
+		},
+		HorizontalRule: ansi.StylePrimitive{
+			Color:  stringPtr(adaptiveColorToString(t.MarkdownHorizontalRule())),
+			Format: "\n─────────────────────────────────────────\n",
+		},
+		Item: ansi.StylePrimitive{
+			BlockPrefix: "• ",
+			Color:       stringPtr(adaptiveColorToString(t.MarkdownListItem())),
+		},
+		Enumeration: ansi.StylePrimitive{
+			BlockPrefix: ". ",
+			Color:       stringPtr(adaptiveColorToString(t.MarkdownListEnumeration())),
+		},
+		Task: ansi.StyleTask{
+			StylePrimitive: ansi.StylePrimitive{},
+			Ticked:         "[✓] ",
+			Unticked:       "[ ] ",
+		},
+		Link: ansi.StylePrimitive{
+			Color:     stringPtr(adaptiveColorToString(t.MarkdownLink())),
+			Underline: boolPtr(true),
+		},
+		LinkText: ansi.StylePrimitive{
+			Color: stringPtr(adaptiveColorToString(t.MarkdownLinkText())),
+			Bold:  boolPtr(true),
+		},
+		Image: ansi.StylePrimitive{
+			Color:     stringPtr(adaptiveColorToString(t.MarkdownImage())),
+			Underline: boolPtr(true),
+			Format:    "🖼 {{.text}}",
+		},
+		ImageText: ansi.StylePrimitive{
+			Color:  stringPtr(adaptiveColorToString(t.MarkdownImageText())),
+			Format: "{{.text}}",
+		},
+		Code: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Color:  stringPtr(adaptiveColorToString(t.MarkdownCode())),
+				Prefix: "",
+				Suffix: "",
+			},
+		},
+		CodeBlock: ansi.StyleCodeBlock{
+			StyleBlock: ansi.StyleBlock{
+				StylePrimitive: ansi.StylePrimitive{
+					Prefix: " ",
+					Color:  stringPtr(adaptiveColorToString(t.MarkdownCodeBlock())),
+				},
+				Margin: uintPtr(defaultMargin),
+			},
+			Chroma: &ansi.Chroma{
+				Text: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.MarkdownText())),
+				},
+				Error: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.Error())),
+				},
+				Comment: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxComment())),
+				},
+				CommentPreproc: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxKeyword())),
+				},
+				Keyword: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxKeyword())),
+				},
+				KeywordReserved: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxKeyword())),
+				},
+				KeywordNamespace: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxKeyword())),
+				},
+				KeywordType: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxType())),
+				},
+				Operator: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxOperator())),
+				},
+				Punctuation: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxPunctuation())),
+				},
+				Name: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxVariable())),
+				},
+				NameBuiltin: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxVariable())),
+				},
+				NameTag: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxKeyword())),
+				},
+				NameAttribute: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxFunction())),
+				},
+				NameClass: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxType())),
+				},
+				NameConstant: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxVariable())),
+				},
+				NameDecorator: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxFunction())),
+				},
+				NameFunction: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxFunction())),
+				},
+				LiteralNumber: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxNumber())),
+				},
+				LiteralString: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxString())),
+				},
+				LiteralStringEscape: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.SyntaxKeyword())),
+				},
+				GenericDeleted: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.DiffRemoved())),
+				},
+				GenericEmph: ansi.StylePrimitive{
+					Color:  stringPtr(adaptiveColorToString(t.MarkdownEmph())),
+					Italic: boolPtr(true),
+				},
+				GenericInserted: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.DiffAdded())),
+				},
+				GenericStrong: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.MarkdownStrong())),
+					Bold:  boolPtr(true),
+				},
+				GenericSubheading: ansi.StylePrimitive{
+					Color: stringPtr(adaptiveColorToString(t.MarkdownHeading())),
+				},
+			},
+		},
+		Table: ansi.StyleTable{
+			StyleBlock: ansi.StyleBlock{
+				StylePrimitive: ansi.StylePrimitive{
+					BlockPrefix: "\n",
+					BlockSuffix: "\n",
+				},
+			},
+			CenterSeparator: stringPtr("┼"),
+			ColumnSeparator: stringPtr("│"),
+			RowSeparator:    stringPtr("─"),
+		},
+		DefinitionDescription: ansi.StylePrimitive{
+			BlockPrefix: "\n ❯ ",
+			Color:       stringPtr(adaptiveColorToString(t.MarkdownLinkText())),
+		},
+		Text: ansi.StylePrimitive{
+			Color: stringPtr(adaptiveColorToString(t.MarkdownText())),
+		},
+		Paragraph: ansi.StyleBlock{
+			StylePrimitive: ansi.StylePrimitive{
+				Color: stringPtr(adaptiveColorToString(t.MarkdownText())),
+			},
+		},
+	}
+}
+
+// adaptiveColorToString converts a lipgloss.AdaptiveColor to the appropriate
+// hex color string based on the current terminal background
+func adaptiveColorToString(color lipgloss.AdaptiveColor) string {
+	if lipgloss.HasDarkBackground() {
+		return color.Dark
+	}
+	return color.Light
+}

pkg/tui/styles/styles.go

@@ -0,0 +1,159 @@
+package styles
+
+import (
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/tui/theme"
+)
+
+var (
+	ImageBakcground = "#212121"
+)
+
+// Style generation functions that use the current theme
+
+// BaseStyle returns the base style with background and foreground colors
+func BaseStyle() lipgloss.Style {
+	t := theme.CurrentTheme()
+	return lipgloss.NewStyle().
+		Background(t.Background()).
+		Foreground(t.Text())
+}
+
+// Regular returns a basic unstyled lipgloss.Style
+func Regular() lipgloss.Style {
+	return lipgloss.NewStyle()
+}
+
+func Muted() lipgloss.Style {
+	return lipgloss.NewStyle().Foreground(theme.CurrentTheme().TextMuted())
+}
+
+// Bold returns a bold style
+func Bold() lipgloss.Style {
+	return Regular().Bold(true)
+}
+
+// Padded returns a style with horizontal padding
+func Padded() lipgloss.Style {
+	return Regular().Padding(0, 1)
+}
+
+// Border returns a style with a normal border
+func Border() lipgloss.Style {
+	t := theme.CurrentTheme()
+	return Regular().
+		Border(lipgloss.NormalBorder()).
+		BorderForeground(t.BorderNormal())
+}
+
+// ThickBorder returns a style with a thick border
+func ThickBorder() lipgloss.Style {
+	t := theme.CurrentTheme()
+	return Regular().
+		Border(lipgloss.ThickBorder()).
+		BorderForeground(t.BorderNormal())
+}
+
+// DoubleBorder returns a style with a double border
+func DoubleBorder() lipgloss.Style {
+	t := theme.CurrentTheme()
+	return Regular().
+		Border(lipgloss.DoubleBorder()).
+		BorderForeground(t.BorderNormal())
+}
+
+// FocusedBorder returns a style with a border using the focused border color
+func FocusedBorder() lipgloss.Style {
+	t := theme.CurrentTheme()
+	return Regular().
+		Border(lipgloss.NormalBorder()).
+		BorderForeground(t.BorderFocused())
+}
+
+// DimBorder returns a style with a border using the dim border color
+func DimBorder() lipgloss.Style {
+	t := theme.CurrentTheme()
+	return Regular().
+		Border(lipgloss.NormalBorder()).
+		BorderForeground(t.BorderDim())
+}
+
+// PrimaryColor returns the primary color from the current theme
+func PrimaryColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Primary()
+}
+
+// SecondaryColor returns the secondary color from the current theme
+func SecondaryColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Secondary()
+}
+
+// AccentColor returns the accent color from the current theme
+func AccentColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Accent()
+}
+
+// ErrorColor returns the error color from the current theme
+func ErrorColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Error()
+}
+
+// WarningColor returns the warning color from the current theme
+func WarningColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Warning()
+}
+
+// SuccessColor returns the success color from the current theme
+func SuccessColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Success()
+}
+
+// InfoColor returns the info color from the current theme
+func InfoColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Info()
+}
+
+// TextColor returns the text color from the current theme
+func TextColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Text()
+}
+
+// TextMutedColor returns the muted text color from the current theme
+func TextMutedColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().TextMuted()
+}
+
+// TextEmphasizedColor returns the emphasized text color from the current theme
+func TextEmphasizedColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().TextEmphasized()
+}
+
+// BackgroundColor returns the background color from the current theme
+func BackgroundColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().Background()
+}
+
+// BackgroundSecondaryColor returns the secondary background color from the current theme
+func BackgroundSecondaryColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().BackgroundSecondary()
+}
+
+// BackgroundDarkerColor returns the darker background color from the current theme
+func BackgroundDarkerColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().BackgroundDarker()
+}
+
+// BorderNormalColor returns the normal border color from the current theme
+func BorderNormalColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().BorderNormal()
+}
+
+// BorderFocusedColor returns the focused border color from the current theme
+func BorderFocusedColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().BorderFocused()
+}
+
+// BorderDimColor returns the dim border color from the current theme
+func BorderDimColor() lipgloss.AdaptiveColor {
+	return theme.CurrentTheme().BorderDim()
+}

pkg/tui/theme/catppuccin.go

@@ -0,0 +1,248 @@
+package theme
+
+import (
+	catppuccin "github.com/catppuccin/go"
+	"github.com/charmbracelet/lipgloss"
+)
+
+// CatppuccinTheme implements the Theme interface with Catppuccin colors.
+// It provides both dark (Mocha) and light (Latte) variants.
+type CatppuccinTheme struct {
+	BaseTheme
+}
+
+// NewCatppuccinTheme creates a new instance of the Catppuccin theme.
+func NewCatppuccinTheme() *CatppuccinTheme {
+	// Get the Catppuccin palettes
+	mocha := catppuccin.Mocha
+	latte := catppuccin.Latte
+
+	theme := &CatppuccinTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Blue().Hex,
+		Light: latte.Blue().Hex,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Mauve().Hex,
+		Light: latte.Mauve().Hex,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Peach().Hex,
+		Light: latte.Peach().Hex,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Red().Hex,
+		Light: latte.Red().Hex,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Peach().Hex,
+		Light: latte.Peach().Hex,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Green().Hex,
+		Light: latte.Green().Hex,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Blue().Hex,
+		Light: latte.Blue().Hex,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Text().Hex,
+		Light: latte.Text().Hex,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Subtext0().Hex,
+		Light: latte.Subtext0().Hex,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Lavender().Hex,
+		Light: latte.Lavender().Hex,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  "#212121", // From existing styles
+		Light: "#EEEEEE", // Light equivalent
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  "#2c2c2c", // From existing styles
+		Light: "#E0E0E0", // Light equivalent
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  "#181818", // From existing styles
+		Light: "#F5F5F5", // Light equivalent
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  "#4b4c5c", // From existing styles
+		Light: "#BDBDBD", // Light equivalent
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Blue().Hex,
+		Light: latte.Blue().Hex,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Surface0().Hex,
+		Light: latte.Surface0().Hex,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#478247", // From existing diff.go
+		Light: "#2E7D32", // Light equivalent
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#7C4444", // From existing diff.go
+		Light: "#C62828", // Light equivalent
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  "#a0a0a0", // From existing diff.go
+		Light: "#757575", // Light equivalent
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  "#a0a0a0", // From existing diff.go
+		Light: "#757575", // Light equivalent
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#DAFADA", // From existing diff.go
+		Light: "#A5D6A7", // Light equivalent
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#FADADD", // From existing diff.go
+		Light: "#EF9A9A", // Light equivalent
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#303A30", // From existing diff.go
+		Light: "#E8F5E9", // Light equivalent
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#3A3030", // From existing diff.go
+		Light: "#FFEBEE", // Light equivalent
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#212121", // From existing diff.go
+		Light: "#F5F5F5", // Light equivalent
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  "#888888", // From existing diff.go
+		Light: "#9E9E9E", // Light equivalent
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#293229", // From existing diff.go
+		Light: "#C8E6C9", // Light equivalent
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#332929", // From existing diff.go
+		Light: "#FFCDD2", // Light equivalent
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Text().Hex,
+		Light: latte.Text().Hex,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Mauve().Hex,
+		Light: latte.Mauve().Hex,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Sky().Hex,
+		Light: latte.Sky().Hex,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Pink().Hex,
+		Light: latte.Pink().Hex,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Green().Hex,
+		Light: latte.Green().Hex,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Yellow().Hex,
+		Light: latte.Yellow().Hex,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Yellow().Hex,
+		Light: latte.Yellow().Hex,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Peach().Hex,
+		Light: latte.Peach().Hex,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Overlay0().Hex,
+		Light: latte.Overlay0().Hex,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Blue().Hex,
+		Light: latte.Blue().Hex,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Sky().Hex,
+		Light: latte.Sky().Hex,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Sapphire().Hex,
+		Light: latte.Sapphire().Hex,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Pink().Hex,
+		Light: latte.Pink().Hex,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Text().Hex,
+		Light: latte.Text().Hex,
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Overlay1().Hex,
+		Light: latte.Overlay1().Hex,
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Pink().Hex,
+		Light: latte.Pink().Hex,
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Green().Hex,
+		Light: latte.Green().Hex,
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Sky().Hex,
+		Light: latte.Sky().Hex,
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Yellow().Hex,
+		Light: latte.Yellow().Hex,
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Teal().Hex,
+		Light: latte.Teal().Hex,
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Sky().Hex,
+		Light: latte.Sky().Hex,
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Pink().Hex,
+		Light: latte.Pink().Hex,
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  mocha.Text().Hex,
+		Light: latte.Text().Hex,
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Catppuccin theme with the theme manager
+	RegisterTheme("catppuccin", NewCatppuccinTheme())
+}

pkg/tui/theme/dracula.go

@@ -0,0 +1,274 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// DraculaTheme implements the Theme interface with Dracula colors.
+// It provides both dark and light variants, though Dracula is primarily a dark theme.
+type DraculaTheme struct {
+	BaseTheme
+}
+
+// NewDraculaTheme creates a new instance of the Dracula theme.
+func NewDraculaTheme() *DraculaTheme {
+	// Dracula color palette
+	// Official colors from https://draculatheme.com/
+	darkBackground := "#282a36"
+	darkCurrentLine := "#44475a"
+	darkSelection := "#44475a"
+	darkForeground := "#f8f8f2"
+	darkComment := "#6272a4"
+	darkCyan := "#8be9fd"
+	darkGreen := "#50fa7b"
+	darkOrange := "#ffb86c"
+	darkPink := "#ff79c6"
+	darkPurple := "#bd93f9"
+	darkRed := "#ff5555"
+	darkYellow := "#f1fa8c"
+	darkBorder := "#44475a"
+
+	// Light mode approximation (Dracula is primarily a dark theme)
+	lightBackground := "#f8f8f2"
+	lightCurrentLine := "#e6e6e6"
+	lightSelection := "#d8d8d8"
+	lightForeground := "#282a36"
+	lightComment := "#6272a4"
+	lightCyan := "#0097a7"
+	lightGreen := "#388e3c"
+	lightOrange := "#f57c00"
+	lightPink := "#d81b60"
+	lightPurple := "#7e57c2"
+	lightRed := "#e53935"
+	lightYellow := "#fbc02d"
+	lightBorder := "#d8d8d8"
+
+	theme := &DraculaTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkCurrentLine,
+		Light: lightCurrentLine,
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  "#21222c", // Slightly darker than background
+		Light: "#ffffff", // Slightly lighter than background
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  darkBorder,
+		Light: lightBorder,
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  darkSelection,
+		Light: lightSelection,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#50fa7b",
+		Light: "#a5d6a7",
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#ff5555",
+		Light: "#ef9a9a",
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#2c3b2c",
+		Light: "#e8f5e9",
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#3b2c2c",
+		Light: "#ffebee",
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#253025",
+		Light: "#c8e6c9",
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#302525",
+		Light: "#ffcdd2",
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Dracula theme with the theme manager
+	RegisterTheme("dracula", NewDraculaTheme())
+}

pkg/tui/theme/flexoki.go

@@ -0,0 +1,282 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// Flexoki color palette constants
+const (
+	// Base colors
+	flexokiPaper   = "#FFFCF0" // Paper (lightest)
+	flexokiBase50  = "#F2F0E5" // bg-2 (light)
+	flexokiBase100 = "#E6E4D9" // ui (light)
+	flexokiBase150 = "#DAD8CE" // ui-2 (light)
+	flexokiBase200 = "#CECDC3" // ui-3 (light)
+	flexokiBase300 = "#B7B5AC" // tx-3 (light)
+	flexokiBase500 = "#878580" // tx-2 (light)
+	flexokiBase600 = "#6F6E69" // tx (light)
+	flexokiBase700 = "#575653" // tx-3 (dark)
+	flexokiBase800 = "#403E3C" // ui-3 (dark)
+	flexokiBase850 = "#343331" // ui-2 (dark)
+	flexokiBase900 = "#282726" // ui (dark)
+	flexokiBase950 = "#1C1B1A" // bg-2 (dark)
+	flexokiBlack   = "#100F0F" // bg (darkest)
+
+	// Accent colors - Light theme (600)
+	flexokiRed600     = "#AF3029"
+	flexokiOrange600  = "#BC5215"
+	flexokiYellow600  = "#AD8301"
+	flexokiGreen600   = "#66800B"
+	flexokiCyan600    = "#24837B"
+	flexokiBlue600    = "#205EA6"
+	flexokiPurple600  = "#5E409D"
+	flexokiMagenta600 = "#A02F6F"
+
+	// Accent colors - Dark theme (400)
+	flexokiRed400     = "#D14D41"
+	flexokiOrange400  = "#DA702C"
+	flexokiYellow400  = "#D0A215"
+	flexokiGreen400   = "#879A39"
+	flexokiCyan400    = "#3AA99F"
+	flexokiBlue400    = "#4385BE"
+	flexokiPurple400  = "#8B7EC8"
+	flexokiMagenta400 = "#CE5D97"
+)
+
+// FlexokiTheme implements the Theme interface with Flexoki colors.
+// It provides both dark and light variants.
+type FlexokiTheme struct {
+	BaseTheme
+}
+
+// NewFlexokiTheme creates a new instance of the Flexoki theme.
+func NewFlexokiTheme() *FlexokiTheme {
+	theme := &FlexokiTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBlue400,
+		Light: flexokiBlue600,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiPurple400,
+		Light: flexokiPurple600,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiOrange400,
+		Light: flexokiOrange600,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiRed400,
+		Light: flexokiRed600,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiYellow400,
+		Light: flexokiYellow600,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiGreen400,
+		Light: flexokiGreen600,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiCyan400,
+		Light: flexokiCyan600,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase300,
+		Light: flexokiBase600,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase700,
+		Light: flexokiBase500,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiYellow400,
+		Light: flexokiYellow600,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBlack,
+		Light: flexokiPaper,
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase950,
+		Light: flexokiBase50,
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase900,
+		Light: flexokiBase100,
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase900,
+		Light: flexokiBase100,
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBlue400,
+		Light: flexokiBlue600,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase850,
+		Light: flexokiBase150,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiGreen400,
+		Light: flexokiGreen600,
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiRed400,
+		Light: flexokiRed600,
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase700,
+		Light: flexokiBase500,
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase700,
+		Light: flexokiBase500,
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiGreen400,
+		Light: flexokiGreen600,
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiRed400,
+		Light: flexokiRed600,
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#1D2419", // Darker green background
+		Light: "#EFF2E2", // Light green background
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#241919", // Darker red background
+		Light: "#F2E2E2", // Light red background
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBlack,
+		Light: flexokiPaper,
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase700,
+		Light: flexokiBase500,
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#1A2017", // Slightly darker green
+		Light: "#E5EBD9", // Light green
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#201717", // Slightly darker red
+		Light: "#EBD9D9", // Light red
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase300,
+		Light: flexokiBase600,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiYellow400,
+		Light: flexokiYellow600,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiCyan400,
+		Light: flexokiCyan600,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiMagenta400,
+		Light: flexokiMagenta600,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiGreen400,
+		Light: flexokiGreen600,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiCyan400,
+		Light: flexokiCyan600,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiYellow400,
+		Light: flexokiYellow600,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiOrange400,
+		Light: flexokiOrange600,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase800,
+		Light: flexokiBase200,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBlue400,
+		Light: flexokiBlue600,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBlue400,
+		Light: flexokiBlue600,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiPurple400,
+		Light: flexokiPurple600,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiMagenta400,
+		Light: flexokiMagenta600,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase300,
+		Light: flexokiBase600,
+	}
+
+	// Syntax highlighting colors (based on Flexoki's mappings)
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase700, // tx-3
+		Light: flexokiBase300, // tx-3
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiGreen400, // gr
+		Light: flexokiGreen600, // gr
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiOrange400, // or
+		Light: flexokiOrange600, // or
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBlue400, // bl
+		Light: flexokiBlue600, // bl
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiCyan400, // cy
+		Light: flexokiCyan600, // cy
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiPurple400, // pu
+		Light: flexokiPurple600, // pu
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiYellow400, // ye
+		Light: flexokiYellow600, // ye
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase500, // tx-2
+		Light: flexokiBase500, // tx-2
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  flexokiBase500, // tx-2
+		Light: flexokiBase500, // tx-2
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Flexoki theme with the theme manager
+	RegisterTheme("flexoki", NewFlexokiTheme())
+}

pkg/tui/theme/gruvbox.go

@@ -0,0 +1,302 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// Gruvbox color palette constants
+const (
+	// Dark theme colors
+	gruvboxDarkBg0          = "#282828"
+	gruvboxDarkBg0Soft      = "#32302f"
+	gruvboxDarkBg1          = "#3c3836"
+	gruvboxDarkBg2          = "#504945"
+	gruvboxDarkBg3          = "#665c54"
+	gruvboxDarkBg4          = "#7c6f64"
+	gruvboxDarkFg0          = "#fbf1c7"
+	gruvboxDarkFg1          = "#ebdbb2"
+	gruvboxDarkFg2          = "#d5c4a1"
+	gruvboxDarkFg3          = "#bdae93"
+	gruvboxDarkFg4          = "#a89984"
+	gruvboxDarkGray         = "#928374"
+	gruvboxDarkRed          = "#cc241d"
+	gruvboxDarkRedBright    = "#fb4934"
+	gruvboxDarkGreen        = "#98971a"
+	gruvboxDarkGreenBright  = "#b8bb26"
+	gruvboxDarkYellow       = "#d79921"
+	gruvboxDarkYellowBright = "#fabd2f"
+	gruvboxDarkBlue         = "#458588"
+	gruvboxDarkBlueBright   = "#83a598"
+	gruvboxDarkPurple       = "#b16286"
+	gruvboxDarkPurpleBright = "#d3869b"
+	gruvboxDarkAqua         = "#689d6a"
+	gruvboxDarkAquaBright   = "#8ec07c"
+	gruvboxDarkOrange       = "#d65d0e"
+	gruvboxDarkOrangeBright = "#fe8019"
+
+	// Light theme colors
+	gruvboxLightBg0          = "#fbf1c7"
+	gruvboxLightBg0Soft      = "#f2e5bc"
+	gruvboxLightBg1          = "#ebdbb2"
+	gruvboxLightBg2          = "#d5c4a1"
+	gruvboxLightBg3          = "#bdae93"
+	gruvboxLightBg4          = "#a89984"
+	gruvboxLightFg0          = "#282828"
+	gruvboxLightFg1          = "#3c3836"
+	gruvboxLightFg2          = "#504945"
+	gruvboxLightFg3          = "#665c54"
+	gruvboxLightFg4          = "#7c6f64"
+	gruvboxLightGray         = "#928374"
+	gruvboxLightRed          = "#9d0006"
+	gruvboxLightRedBright    = "#cc241d"
+	gruvboxLightGreen        = "#79740e"
+	gruvboxLightGreenBright  = "#98971a"
+	gruvboxLightYellow       = "#b57614"
+	gruvboxLightYellowBright = "#d79921"
+	gruvboxLightBlue         = "#076678"
+	gruvboxLightBlueBright   = "#458588"
+	gruvboxLightPurple       = "#8f3f71"
+	gruvboxLightPurpleBright = "#b16286"
+	gruvboxLightAqua         = "#427b58"
+	gruvboxLightAquaBright   = "#689d6a"
+	gruvboxLightOrange       = "#af3a03"
+	gruvboxLightOrangeBright = "#d65d0e"
+)
+
+// GruvboxTheme implements the Theme interface with Gruvbox colors.
+// It provides both dark and light variants.
+type GruvboxTheme struct {
+	BaseTheme
+}
+
+// NewGruvboxTheme creates a new instance of the Gruvbox theme.
+func NewGruvboxTheme() *GruvboxTheme {
+	theme := &GruvboxTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBlueBright,
+		Light: gruvboxLightBlueBright,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkPurpleBright,
+		Light: gruvboxLightPurpleBright,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkOrangeBright,
+		Light: gruvboxLightOrangeBright,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkRedBright,
+		Light: gruvboxLightRedBright,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkYellowBright,
+		Light: gruvboxLightYellowBright,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkGreenBright,
+		Light: gruvboxLightGreenBright,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBlueBright,
+		Light: gruvboxLightBlueBright,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkFg1,
+		Light: gruvboxLightFg1,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkFg4,
+		Light: gruvboxLightFg4,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkYellowBright,
+		Light: gruvboxLightYellowBright,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBg0,
+		Light: gruvboxLightBg0,
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBg1,
+		Light: gruvboxLightBg1,
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBg0Soft,
+		Light: gruvboxLightBg0Soft,
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBg2,
+		Light: gruvboxLightBg2,
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBlueBright,
+		Light: gruvboxLightBlueBright,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBg1,
+		Light: gruvboxLightBg1,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkGreenBright,
+		Light: gruvboxLightGreenBright,
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkRedBright,
+		Light: gruvboxLightRedBright,
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkFg4,
+		Light: gruvboxLightFg4,
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkFg3,
+		Light: gruvboxLightFg3,
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkGreenBright,
+		Light: gruvboxLightGreenBright,
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkRedBright,
+		Light: gruvboxLightRedBright,
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#3C4C3C", // Darker green background
+		Light: "#E8F5E9", // Light green background
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#4C3C3C", // Darker red background
+		Light: "#FFEBEE", // Light red background
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBg0,
+		Light: gruvboxLightBg0,
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkFg4,
+		Light: gruvboxLightFg4,
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#32432F", // Slightly darker green
+		Light: "#C8E6C9", // Light green
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#43322F", // Slightly darker red
+		Light: "#FFCDD2", // Light red
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkFg1,
+		Light: gruvboxLightFg1,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkYellowBright,
+		Light: gruvboxLightYellowBright,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBlueBright,
+		Light: gruvboxLightBlueBright,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkAquaBright,
+		Light: gruvboxLightAquaBright,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkGreenBright,
+		Light: gruvboxLightGreenBright,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkAquaBright,
+		Light: gruvboxLightAquaBright,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkYellowBright,
+		Light: gruvboxLightYellowBright,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkOrangeBright,
+		Light: gruvboxLightOrangeBright,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBg3,
+		Light: gruvboxLightBg3,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBlueBright,
+		Light: gruvboxLightBlueBright,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBlueBright,
+		Light: gruvboxLightBlueBright,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkPurpleBright,
+		Light: gruvboxLightPurpleBright,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkAquaBright,
+		Light: gruvboxLightAquaBright,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkFg1,
+		Light: gruvboxLightFg1,
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkGray,
+		Light: gruvboxLightGray,
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkRedBright,
+		Light: gruvboxLightRedBright,
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkGreenBright,
+		Light: gruvboxLightGreenBright,
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkBlueBright,
+		Light: gruvboxLightBlueBright,
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkYellowBright,
+		Light: gruvboxLightYellowBright,
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkPurpleBright,
+		Light: gruvboxLightPurpleBright,
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkYellow,
+		Light: gruvboxLightYellow,
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkAquaBright,
+		Light: gruvboxLightAquaBright,
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  gruvboxDarkFg1,
+		Light: gruvboxLightFg1,
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Gruvbox theme with the theme manager
+	RegisterTheme("gruvbox", NewGruvboxTheme())
+}

pkg/tui/theme/manager.go

@@ -0,0 +1,265 @@
+package theme
+
+import (
+	"fmt"
+	"log/slog"
+	"slices"
+	"strings"
+	"sync"
+
+	"github.com/alecthomas/chroma/v2/styles"
+	"github.com/sst/opencode/internal/config"
+)
+
+// Manager handles theme registration, selection, and retrieval.
+// It maintains a registry of available themes and tracks the currently active theme.
+type Manager struct {
+	themes      map[string]Theme
+	currentName string
+	mu          sync.RWMutex
+}
+
+// Global instance of the theme manager
+var globalManager = &Manager{
+	themes:      make(map[string]Theme),
+	currentName: "",
+}
+
+// Default theme instance for custom theme defaulting
+var defaultThemeColors = NewOpenCodeTheme()
+
+// RegisterTheme adds a new theme to the registry.
+// If this is the first theme registered, it becomes the default.
+func RegisterTheme(name string, theme Theme) {
+	globalManager.mu.Lock()
+	defer globalManager.mu.Unlock()
+
+	globalManager.themes[name] = theme
+
+	// If this is the first theme, make it the default
+	if globalManager.currentName == "" {
+		globalManager.currentName = name
+	}
+}
+
+// SetTheme changes the active theme to the one with the specified name.
+// Returns an error if the theme doesn't exist.
+func SetTheme(name string) error {
+	globalManager.mu.Lock()
+	defer globalManager.mu.Unlock()
+
+	delete(styles.Registry, "charm")
+
+	// Handle custom theme
+	if name == "custom" {
+		cfg := config.Get()
+		if cfg == nil || cfg.TUI.CustomTheme == nil || len(cfg.TUI.CustomTheme) == 0 {
+			return fmt.Errorf("custom theme selected but no custom theme colors defined in config")
+		}
+
+		customTheme, err := LoadCustomTheme(cfg.TUI.CustomTheme)
+		if err != nil {
+			return fmt.Errorf("failed to load custom theme: %w", err)
+		}
+
+		// Register the custom theme
+		globalManager.themes["custom"] = customTheme
+	} else if _, exists := globalManager.themes[name]; !exists {
+		return fmt.Errorf("theme '%s' not found", name)
+	}
+
+	globalManager.currentName = name
+
+	// Update the config file using viper
+	if err := updateConfigTheme(name); err != nil {
+		// Log the error but don't fail the theme change
+		slog.Warn("Warning: Failed to update config file with new theme", "err", err)
+	}
+
+	return nil
+}
+
+// CurrentTheme returns the currently active theme.
+// If no theme is set, it returns nil.
+func CurrentTheme() Theme {
+	globalManager.mu.RLock()
+	defer globalManager.mu.RUnlock()
+
+	if globalManager.currentName == "" {
+		return nil
+	}
+
+	return globalManager.themes[globalManager.currentName]
+}
+
+// CurrentThemeName returns the name of the currently active theme.
+func CurrentThemeName() string {
+	globalManager.mu.RLock()
+	defer globalManager.mu.RUnlock()
+
+	return globalManager.currentName
+}
+
+// AvailableThemes returns a list of all registered theme names.
+func AvailableThemes() []string {
+	globalManager.mu.RLock()
+	defer globalManager.mu.RUnlock()
+
+	names := make([]string, 0, len(globalManager.themes))
+	for name := range globalManager.themes {
+		names = append(names, name)
+	}
+	slices.SortFunc(names, func(a, b string) int {
+		if a == "opencode" {
+			return -1
+		} else if b == "opencode" {
+			return 1
+		}
+		return strings.Compare(a, b)
+	})
+	return names
+}
+
+// GetTheme returns a specific theme by name.
+// Returns nil if the theme doesn't exist.
+func GetTheme(name string) Theme {
+	globalManager.mu.RLock()
+	defer globalManager.mu.RUnlock()
+
+	return globalManager.themes[name]
+}
+
+// LoadCustomTheme creates a new theme instance based on the custom theme colors
+// defined in the configuration. It uses the default OpenCode theme as a base
+// and overrides colors that are specified in the customTheme map.
+func LoadCustomTheme(customTheme map[string]any) (Theme, error) {
+	// Create a new theme based on the default OpenCode theme
+	theme := NewOpenCodeTheme()
+
+	// Process each color in the custom theme map
+	for key, value := range customTheme {
+		adaptiveColor, err := ParseAdaptiveColor(value)
+		if err != nil {
+			slog.Warn("Invalid color definition in custom theme", "key", key, "error", err)
+			continue // Skip this color but continue processing others
+		}
+
+		// Set the color in the theme based on the key
+		switch strings.ToLower(key) {
+		case "primary":
+			theme.PrimaryColor = adaptiveColor
+		case "secondary":
+			theme.SecondaryColor = adaptiveColor
+		case "accent":
+			theme.AccentColor = adaptiveColor
+		case "error":
+			theme.ErrorColor = adaptiveColor
+		case "warning":
+			theme.WarningColor = adaptiveColor
+		case "success":
+			theme.SuccessColor = adaptiveColor
+		case "info":
+			theme.InfoColor = adaptiveColor
+		case "text":
+			theme.TextColor = adaptiveColor
+		case "textmuted":
+			theme.TextMutedColor = adaptiveColor
+		case "textemphasized":
+			theme.TextEmphasizedColor = adaptiveColor
+		case "background":
+			theme.BackgroundColor = adaptiveColor
+		case "backgroundsecondary":
+			theme.BackgroundSecondaryColor = adaptiveColor
+		case "backgrounddarker":
+			theme.BackgroundDarkerColor = adaptiveColor
+		case "bordernormal":
+			theme.BorderNormalColor = adaptiveColor
+		case "borderfocused":
+			theme.BorderFocusedColor = adaptiveColor
+		case "borderdim":
+			theme.BorderDimColor = adaptiveColor
+		case "diffadded":
+			theme.DiffAddedColor = adaptiveColor
+		case "diffremoved":
+			theme.DiffRemovedColor = adaptiveColor
+		case "diffcontext":
+			theme.DiffContextColor = adaptiveColor
+		case "diffhunkheader":
+			theme.DiffHunkHeaderColor = adaptiveColor
+		case "diffhighlightadded":
+			theme.DiffHighlightAddedColor = adaptiveColor
+		case "diffhighlightremoved":
+			theme.DiffHighlightRemovedColor = adaptiveColor
+		case "diffaddedbg":
+			theme.DiffAddedBgColor = adaptiveColor
+		case "diffremovedbg":
+			theme.DiffRemovedBgColor = adaptiveColor
+		case "diffcontextbg":
+			theme.DiffContextBgColor = adaptiveColor
+		case "difflinenumber":
+			theme.DiffLineNumberColor = adaptiveColor
+		case "diffaddedlinenumberbg":
+			theme.DiffAddedLineNumberBgColor = adaptiveColor
+		case "diffremovedlinenumberbg":
+			theme.DiffRemovedLineNumberBgColor = adaptiveColor
+		case "syntaxcomment":
+			theme.SyntaxCommentColor = adaptiveColor
+		case "syntaxkeyword":
+			theme.SyntaxKeywordColor = adaptiveColor
+		case "syntaxfunction":
+			theme.SyntaxFunctionColor = adaptiveColor
+		case "syntaxvariable":
+			theme.SyntaxVariableColor = adaptiveColor
+		case "syntaxstring":
+			theme.SyntaxStringColor = adaptiveColor
+		case "syntaxnumber":
+			theme.SyntaxNumberColor = adaptiveColor
+		case "syntaxtype":
+			theme.SyntaxTypeColor = adaptiveColor
+		case "syntaxoperator":
+			theme.SyntaxOperatorColor = adaptiveColor
+		case "syntaxpunctuation":
+			theme.SyntaxPunctuationColor = adaptiveColor
+		case "markdowntext":
+			theme.MarkdownTextColor = adaptiveColor
+		case "markdownheading":
+			theme.MarkdownHeadingColor = adaptiveColor
+		case "markdownlink":
+			theme.MarkdownLinkColor = adaptiveColor
+		case "markdownlinktext":
+			theme.MarkdownLinkTextColor = adaptiveColor
+		case "markdowncode":
+			theme.MarkdownCodeColor = adaptiveColor
+		case "markdownblockquote":
+			theme.MarkdownBlockQuoteColor = adaptiveColor
+		case "markdownemph":
+			theme.MarkdownEmphColor = adaptiveColor
+		case "markdownstrong":
+			theme.MarkdownStrongColor = adaptiveColor
+		case "markdownhorizontalrule":
+			theme.MarkdownHorizontalRuleColor = adaptiveColor
+		case "markdownlistitem":
+			theme.MarkdownListItemColor = adaptiveColor
+		case "markdownlistitemenum":
+			theme.MarkdownListEnumerationColor = adaptiveColor
+		case "markdownimage":
+			theme.MarkdownImageColor = adaptiveColor
+		case "markdownimagetext":
+			theme.MarkdownImageTextColor = adaptiveColor
+		case "markdowncodeblock":
+			theme.MarkdownCodeBlockColor = adaptiveColor
+		case "markdownlistenumeration":
+			theme.MarkdownListEnumerationColor = adaptiveColor
+		default:
+			slog.Warn("Unknown color key in custom theme", "key", key)
+		}
+	}
+
+	return theme, nil
+}
+
+// updateConfigTheme updates the theme setting in the configuration file
+func updateConfigTheme(themeName string) error {
+	// Use the config package to update the theme
+	return config.UpdateTheme(themeName)
+}

pkg/tui/theme/monokai.go

@@ -0,0 +1,273 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// MonokaiProTheme implements the Theme interface with Monokai Pro colors.
+// It provides both dark and light variants.
+type MonokaiProTheme struct {
+	BaseTheme
+}
+
+// NewMonokaiProTheme creates a new instance of the Monokai Pro theme.
+func NewMonokaiProTheme() *MonokaiProTheme {
+	// Monokai Pro color palette (dark mode)
+	darkBackground := "#2d2a2e"
+	darkCurrentLine := "#403e41"
+	darkSelection := "#5b595c"
+	darkForeground := "#fcfcfa"
+	darkComment := "#727072"
+	darkRed := "#ff6188"
+	darkOrange := "#fc9867"
+	darkYellow := "#ffd866"
+	darkGreen := "#a9dc76"
+	darkCyan := "#78dce8"
+	darkBlue := "#ab9df2"
+	darkPurple := "#ab9df2"
+	darkBorder := "#403e41"
+
+	// Light mode colors (adapted from dark)
+	lightBackground := "#fafafa"
+	lightCurrentLine := "#f0f0f0"
+	lightSelection := "#e5e5e6"
+	lightForeground := "#2d2a2e"
+	lightComment := "#939293"
+	lightRed := "#f92672"
+	lightOrange := "#fd971f"
+	lightYellow := "#e6db74"
+	lightGreen := "#9bca65"
+	lightCyan := "#66d9ef"
+	lightBlue := "#7e75db"
+	lightPurple := "#ae81ff"
+	lightBorder := "#d3d3d3"
+
+	theme := &MonokaiProTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkCurrentLine,
+		Light: lightCurrentLine,
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  "#221f22", // Slightly darker than background
+		Light: "#ffffff", // Slightly lighter than background
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  darkBorder,
+		Light: lightBorder,
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  darkSelection,
+		Light: lightSelection,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#a9dc76",
+		Light: "#9bca65",
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#ff6188",
+		Light: "#f92672",
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  "#a0a0a0",
+		Light: "#757575",
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  "#a0a0a0",
+		Light: "#757575",
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#c2e7a9",
+		Light: "#c5e0b4",
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#ff8ca6",
+		Light: "#ffb3c8",
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#3a4a35",
+		Light: "#e8f5e9",
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#4a3439",
+		Light: "#ffebee",
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  "#888888",
+		Light: "#9e9e9e",
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#2d3a28",
+		Light: "#c8e6c9",
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#3d2a2e",
+		Light: "#ffcdd2",
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Monokai Pro theme with the theme manager
+	RegisterTheme("monokai", NewMonokaiProTheme())
+}

pkg/tui/theme/onedark.go

@@ -0,0 +1,274 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// OneDarkTheme implements the Theme interface with Atom's One Dark colors.
+// It provides both dark and light variants.
+type OneDarkTheme struct {
+	BaseTheme
+}
+
+// NewOneDarkTheme creates a new instance of the One Dark theme.
+func NewOneDarkTheme() *OneDarkTheme {
+	// One Dark color palette
+	// Dark mode colors from Atom One Dark
+	darkBackground := "#282c34"
+	darkCurrentLine := "#2c313c"
+	darkSelection := "#3e4451"
+	darkForeground := "#abb2bf"
+	darkComment := "#5c6370"
+	darkRed := "#e06c75"
+	darkOrange := "#d19a66"
+	darkYellow := "#e5c07b"
+	darkGreen := "#98c379"
+	darkCyan := "#56b6c2"
+	darkBlue := "#61afef"
+	darkPurple := "#c678dd"
+	darkBorder := "#3b4048"
+
+	// Light mode colors from Atom One Light
+	lightBackground := "#fafafa"
+	lightCurrentLine := "#f0f0f0"
+	lightSelection := "#e5e5e6"
+	lightForeground := "#383a42"
+	lightComment := "#a0a1a7"
+	lightRed := "#e45649"
+	lightOrange := "#da8548"
+	lightYellow := "#c18401"
+	lightGreen := "#50a14f"
+	lightCyan := "#0184bc"
+	lightBlue := "#4078f2"
+	lightPurple := "#a626a4"
+	lightBorder := "#d3d3d3"
+
+	theme := &OneDarkTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkCurrentLine,
+		Light: lightCurrentLine,
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  "#21252b", // Slightly darker than background
+		Light: "#ffffff", // Slightly lighter than background
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  darkBorder,
+		Light: lightBorder,
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  darkSelection,
+		Light: lightSelection,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#478247",
+		Light: "#2E7D32",
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#7C4444",
+		Light: "#C62828",
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  "#a0a0a0",
+		Light: "#757575",
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  "#a0a0a0",
+		Light: "#757575",
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#DAFADA",
+		Light: "#A5D6A7",
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#FADADD",
+		Light: "#EF9A9A",
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#303A30",
+		Light: "#E8F5E9",
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#3A3030",
+		Light: "#FFEBEE",
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  "#888888",
+		Light: "#9E9E9E",
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#293229",
+		Light: "#C8E6C9",
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#332929",
+		Light: "#FFCDD2",
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the One Dark theme with the theme manager
+	RegisterTheme("onedark", NewOneDarkTheme())
+}

pkg/tui/theme/theme.go

@@ -0,0 +1,290 @@
+package theme
+
+import (
+	"fmt"
+	"regexp"
+
+	"github.com/charmbracelet/lipgloss"
+)
+
+// Theme defines the interface for all UI themes in the application.
+// All colors must be defined as lipgloss.AdaptiveColor to support
+// both light and dark terminal backgrounds.
+type Theme interface {
+	// Base colors
+	Primary() lipgloss.AdaptiveColor
+	Secondary() lipgloss.AdaptiveColor
+	Accent() lipgloss.AdaptiveColor
+
+	// Status colors
+	Error() lipgloss.AdaptiveColor
+	Warning() lipgloss.AdaptiveColor
+	Success() lipgloss.AdaptiveColor
+	Info() lipgloss.AdaptiveColor
+
+	// Text colors
+	Text() lipgloss.AdaptiveColor
+	TextMuted() lipgloss.AdaptiveColor
+	TextEmphasized() lipgloss.AdaptiveColor
+
+	// Background colors
+	Background() lipgloss.AdaptiveColor
+	BackgroundSecondary() lipgloss.AdaptiveColor
+	BackgroundDarker() lipgloss.AdaptiveColor
+
+	// Border colors
+	BorderNormal() lipgloss.AdaptiveColor
+	BorderFocused() lipgloss.AdaptiveColor
+	BorderDim() lipgloss.AdaptiveColor
+
+	// Diff view colors
+	DiffAdded() lipgloss.AdaptiveColor
+	DiffRemoved() lipgloss.AdaptiveColor
+	DiffContext() lipgloss.AdaptiveColor
+	DiffHunkHeader() lipgloss.AdaptiveColor
+	DiffHighlightAdded() lipgloss.AdaptiveColor
+	DiffHighlightRemoved() lipgloss.AdaptiveColor
+	DiffAddedBg() lipgloss.AdaptiveColor
+	DiffRemovedBg() lipgloss.AdaptiveColor
+	DiffContextBg() lipgloss.AdaptiveColor
+	DiffLineNumber() lipgloss.AdaptiveColor
+	DiffAddedLineNumberBg() lipgloss.AdaptiveColor
+	DiffRemovedLineNumberBg() lipgloss.AdaptiveColor
+
+	// Markdown colors
+	MarkdownText() lipgloss.AdaptiveColor
+	MarkdownHeading() lipgloss.AdaptiveColor
+	MarkdownLink() lipgloss.AdaptiveColor
+	MarkdownLinkText() lipgloss.AdaptiveColor
+	MarkdownCode() lipgloss.AdaptiveColor
+	MarkdownBlockQuote() lipgloss.AdaptiveColor
+	MarkdownEmph() lipgloss.AdaptiveColor
+	MarkdownStrong() lipgloss.AdaptiveColor
+	MarkdownHorizontalRule() lipgloss.AdaptiveColor
+	MarkdownListItem() lipgloss.AdaptiveColor
+	MarkdownListEnumeration() lipgloss.AdaptiveColor
+	MarkdownImage() lipgloss.AdaptiveColor
+	MarkdownImageText() lipgloss.AdaptiveColor
+	MarkdownCodeBlock() lipgloss.AdaptiveColor
+
+	// Syntax highlighting colors
+	SyntaxComment() lipgloss.AdaptiveColor
+	SyntaxKeyword() lipgloss.AdaptiveColor
+	SyntaxFunction() lipgloss.AdaptiveColor
+	SyntaxVariable() lipgloss.AdaptiveColor
+	SyntaxString() lipgloss.AdaptiveColor
+	SyntaxNumber() lipgloss.AdaptiveColor
+	SyntaxType() lipgloss.AdaptiveColor
+	SyntaxOperator() lipgloss.AdaptiveColor
+	SyntaxPunctuation() lipgloss.AdaptiveColor
+}
+
+// BaseTheme provides a default implementation of the Theme interface
+// that can be embedded in concrete theme implementations.
+type BaseTheme struct {
+	// Base colors
+	PrimaryColor   lipgloss.AdaptiveColor
+	SecondaryColor lipgloss.AdaptiveColor
+	AccentColor    lipgloss.AdaptiveColor
+
+	// Status colors
+	ErrorColor   lipgloss.AdaptiveColor
+	WarningColor lipgloss.AdaptiveColor
+	SuccessColor lipgloss.AdaptiveColor
+	InfoColor    lipgloss.AdaptiveColor
+
+	// Text colors
+	TextColor           lipgloss.AdaptiveColor
+	TextMutedColor      lipgloss.AdaptiveColor
+	TextEmphasizedColor lipgloss.AdaptiveColor
+
+	// Background colors
+	BackgroundColor          lipgloss.AdaptiveColor
+	BackgroundSecondaryColor lipgloss.AdaptiveColor
+	BackgroundDarkerColor    lipgloss.AdaptiveColor
+
+	// Border colors
+	BorderNormalColor  lipgloss.AdaptiveColor
+	BorderFocusedColor lipgloss.AdaptiveColor
+	BorderDimColor     lipgloss.AdaptiveColor
+
+	// Diff view colors
+	DiffAddedColor               lipgloss.AdaptiveColor
+	DiffRemovedColor             lipgloss.AdaptiveColor
+	DiffContextColor             lipgloss.AdaptiveColor
+	DiffHunkHeaderColor          lipgloss.AdaptiveColor
+	DiffHighlightAddedColor      lipgloss.AdaptiveColor
+	DiffHighlightRemovedColor    lipgloss.AdaptiveColor
+	DiffAddedBgColor             lipgloss.AdaptiveColor
+	DiffRemovedBgColor           lipgloss.AdaptiveColor
+	DiffContextBgColor           lipgloss.AdaptiveColor
+	DiffLineNumberColor          lipgloss.AdaptiveColor
+	DiffAddedLineNumberBgColor   lipgloss.AdaptiveColor
+	DiffRemovedLineNumberBgColor lipgloss.AdaptiveColor
+
+	// Markdown colors
+	MarkdownTextColor            lipgloss.AdaptiveColor
+	MarkdownHeadingColor         lipgloss.AdaptiveColor
+	MarkdownLinkColor            lipgloss.AdaptiveColor
+	MarkdownLinkTextColor        lipgloss.AdaptiveColor
+	MarkdownCodeColor            lipgloss.AdaptiveColor
+	MarkdownBlockQuoteColor      lipgloss.AdaptiveColor
+	MarkdownEmphColor            lipgloss.AdaptiveColor
+	MarkdownStrongColor          lipgloss.AdaptiveColor
+	MarkdownHorizontalRuleColor  lipgloss.AdaptiveColor
+	MarkdownListItemColor        lipgloss.AdaptiveColor
+	MarkdownListEnumerationColor lipgloss.AdaptiveColor
+	MarkdownImageColor           lipgloss.AdaptiveColor
+	MarkdownImageTextColor       lipgloss.AdaptiveColor
+	MarkdownCodeBlockColor       lipgloss.AdaptiveColor
+
+	// Syntax highlighting colors
+	SyntaxCommentColor     lipgloss.AdaptiveColor
+	SyntaxKeywordColor     lipgloss.AdaptiveColor
+	SyntaxFunctionColor    lipgloss.AdaptiveColor
+	SyntaxVariableColor    lipgloss.AdaptiveColor
+	SyntaxStringColor      lipgloss.AdaptiveColor
+	SyntaxNumberColor      lipgloss.AdaptiveColor
+	SyntaxTypeColor        lipgloss.AdaptiveColor
+	SyntaxOperatorColor    lipgloss.AdaptiveColor
+	SyntaxPunctuationColor lipgloss.AdaptiveColor
+}
+
+// Implement the Theme interface for BaseTheme
+func (t *BaseTheme) Primary() lipgloss.AdaptiveColor   { return t.PrimaryColor }
+func (t *BaseTheme) Secondary() lipgloss.AdaptiveColor { return t.SecondaryColor }
+func (t *BaseTheme) Accent() lipgloss.AdaptiveColor    { return t.AccentColor }
+
+func (t *BaseTheme) Error() lipgloss.AdaptiveColor   { return t.ErrorColor }
+func (t *BaseTheme) Warning() lipgloss.AdaptiveColor { return t.WarningColor }
+func (t *BaseTheme) Success() lipgloss.AdaptiveColor { return t.SuccessColor }
+func (t *BaseTheme) Info() lipgloss.AdaptiveColor    { return t.InfoColor }
+
+func (t *BaseTheme) Text() lipgloss.AdaptiveColor           { return t.TextColor }
+func (t *BaseTheme) TextMuted() lipgloss.AdaptiveColor      { return t.TextMutedColor }
+func (t *BaseTheme) TextEmphasized() lipgloss.AdaptiveColor { return t.TextEmphasizedColor }
+
+func (t *BaseTheme) Background() lipgloss.AdaptiveColor          { return t.BackgroundColor }
+func (t *BaseTheme) BackgroundSecondary() lipgloss.AdaptiveColor { return t.BackgroundSecondaryColor }
+func (t *BaseTheme) BackgroundDarker() lipgloss.AdaptiveColor    { return t.BackgroundDarkerColor }
+
+func (t *BaseTheme) BorderNormal() lipgloss.AdaptiveColor  { return t.BorderNormalColor }
+func (t *BaseTheme) BorderFocused() lipgloss.AdaptiveColor { return t.BorderFocusedColor }
+func (t *BaseTheme) BorderDim() lipgloss.AdaptiveColor     { return t.BorderDimColor }
+
+func (t *BaseTheme) DiffAdded() lipgloss.AdaptiveColor            { return t.DiffAddedColor }
+func (t *BaseTheme) DiffRemoved() lipgloss.AdaptiveColor          { return t.DiffRemovedColor }
+func (t *BaseTheme) DiffContext() lipgloss.AdaptiveColor          { return t.DiffContextColor }
+func (t *BaseTheme) DiffHunkHeader() lipgloss.AdaptiveColor       { return t.DiffHunkHeaderColor }
+func (t *BaseTheme) DiffHighlightAdded() lipgloss.AdaptiveColor   { return t.DiffHighlightAddedColor }
+func (t *BaseTheme) DiffHighlightRemoved() lipgloss.AdaptiveColor { return t.DiffHighlightRemovedColor }
+func (t *BaseTheme) DiffAddedBg() lipgloss.AdaptiveColor          { return t.DiffAddedBgColor }
+func (t *BaseTheme) DiffRemovedBg() lipgloss.AdaptiveColor        { return t.DiffRemovedBgColor }
+func (t *BaseTheme) DiffContextBg() lipgloss.AdaptiveColor        { return t.DiffContextBgColor }
+func (t *BaseTheme) DiffLineNumber() lipgloss.AdaptiveColor       { return t.DiffLineNumberColor }
+func (t *BaseTheme) DiffAddedLineNumberBg() lipgloss.AdaptiveColor {
+	return t.DiffAddedLineNumberBgColor
+}
+func (t *BaseTheme) DiffRemovedLineNumberBg() lipgloss.AdaptiveColor {
+	return t.DiffRemovedLineNumberBgColor
+}
+
+func (t *BaseTheme) MarkdownText() lipgloss.AdaptiveColor       { return t.MarkdownTextColor }
+func (t *BaseTheme) MarkdownHeading() lipgloss.AdaptiveColor    { return t.MarkdownHeadingColor }
+func (t *BaseTheme) MarkdownLink() lipgloss.AdaptiveColor       { return t.MarkdownLinkColor }
+func (t *BaseTheme) MarkdownLinkText() lipgloss.AdaptiveColor   { return t.MarkdownLinkTextColor }
+func (t *BaseTheme) MarkdownCode() lipgloss.AdaptiveColor       { return t.MarkdownCodeColor }
+func (t *BaseTheme) MarkdownBlockQuote() lipgloss.AdaptiveColor { return t.MarkdownBlockQuoteColor }
+func (t *BaseTheme) MarkdownEmph() lipgloss.AdaptiveColor       { return t.MarkdownEmphColor }
+func (t *BaseTheme) MarkdownStrong() lipgloss.AdaptiveColor     { return t.MarkdownStrongColor }
+func (t *BaseTheme) MarkdownHorizontalRule() lipgloss.AdaptiveColor {
+	return t.MarkdownHorizontalRuleColor
+}
+func (t *BaseTheme) MarkdownListItem() lipgloss.AdaptiveColor { return t.MarkdownListItemColor }
+func (t *BaseTheme) MarkdownListEnumeration() lipgloss.AdaptiveColor {
+	return t.MarkdownListEnumerationColor
+}
+func (t *BaseTheme) MarkdownImage() lipgloss.AdaptiveColor     { return t.MarkdownImageColor }
+func (t *BaseTheme) MarkdownImageText() lipgloss.AdaptiveColor { return t.MarkdownImageTextColor }
+func (t *BaseTheme) MarkdownCodeBlock() lipgloss.AdaptiveColor { return t.MarkdownCodeBlockColor }
+
+func (t *BaseTheme) SyntaxComment() lipgloss.AdaptiveColor     { return t.SyntaxCommentColor }
+func (t *BaseTheme) SyntaxKeyword() lipgloss.AdaptiveColor     { return t.SyntaxKeywordColor }
+func (t *BaseTheme) SyntaxFunction() lipgloss.AdaptiveColor    { return t.SyntaxFunctionColor }
+func (t *BaseTheme) SyntaxVariable() lipgloss.AdaptiveColor    { return t.SyntaxVariableColor }
+func (t *BaseTheme) SyntaxString() lipgloss.AdaptiveColor      { return t.SyntaxStringColor }
+func (t *BaseTheme) SyntaxNumber() lipgloss.AdaptiveColor      { return t.SyntaxNumberColor }
+func (t *BaseTheme) SyntaxType() lipgloss.AdaptiveColor        { return t.SyntaxTypeColor }
+func (t *BaseTheme) SyntaxOperator() lipgloss.AdaptiveColor    { return t.SyntaxOperatorColor }
+func (t *BaseTheme) SyntaxPunctuation() lipgloss.AdaptiveColor { return t.SyntaxPunctuationColor }
+
+// ParseAdaptiveColor parses a color value from the config file into a lipgloss.AdaptiveColor.
+// It accepts either a string (hex color) or a map with "dark" and "light" keys.
+func ParseAdaptiveColor(value any) (lipgloss.AdaptiveColor, error) {
+	// Regular expression to validate hex color format
+	hexColorRegex := regexp.MustCompile(`^#[0-9a-fA-F]{6}$`)
+
+	// Case 1: String value (same color for both dark and light modes)
+	if hexColor, ok := value.(string); ok {
+		if !hexColorRegex.MatchString(hexColor) {
+			return lipgloss.AdaptiveColor{}, fmt.Errorf("invalid hex color format: %s", hexColor)
+		}
+		return lipgloss.AdaptiveColor{
+			Dark:  hexColor,
+			Light: hexColor,
+		}, nil
+	}
+
+	// Case 2: Int value between 0 and 255
+	if numericVal, ok := value.(float64); ok {
+		intVal := int(numericVal)
+		if intVal < 0 || intVal > 255 {
+			return lipgloss.AdaptiveColor{}, fmt.Errorf("invalid int color value (must be between 0 and 255): %d", intVal)
+		}
+		return lipgloss.AdaptiveColor{
+			Dark:  fmt.Sprintf("%d", intVal),
+			Light: fmt.Sprintf("%d", intVal),
+		}, nil
+	}
+
+	// Case 3: Map with dark and light keys
+	if colorMap, ok := value.(map[string]any); ok {
+		darkVal, darkOk := colorMap["dark"]
+		lightVal, lightOk := colorMap["light"]
+
+		if !darkOk || !lightOk {
+			return lipgloss.AdaptiveColor{}, fmt.Errorf("color map must contain both 'dark' and 'light' keys")
+		}
+
+		darkHex, darkIsString := darkVal.(string)
+		lightHex, lightIsString := lightVal.(string)
+
+		if !darkIsString || !lightIsString {
+			darkVal, darkIsNumber := darkVal.(float64)
+			lightVal, lightIsNumber := lightVal.(float64)
+
+			if !darkIsNumber || !lightIsNumber {
+				return lipgloss.AdaptiveColor{}, fmt.Errorf("color map values must be strings or ints")
+			}
+
+			darkInt := int(darkVal)
+			lightInt := int(lightVal)
+
+			return lipgloss.AdaptiveColor{
+				Dark:  fmt.Sprintf("%d", darkInt),
+				Light: fmt.Sprintf("%d", lightInt),
+			}, nil
+		}
+
+		if !hexColorRegex.MatchString(darkHex) || !hexColorRegex.MatchString(lightHex) {
+			return lipgloss.AdaptiveColor{}, fmt.Errorf("invalid hex color format")
+		}
+
+		return lipgloss.AdaptiveColor{
+			Dark:  darkHex,
+			Light: lightHex,
+		}, nil
+	}
+
+	return lipgloss.AdaptiveColor{}, fmt.Errorf("color must be either a hex string or an object with dark/light keys")
+}

pkg/tui/theme/theme_test.go

@@ -0,0 +1,89 @@
+package theme
+
+import (
+	"testing"
+)
+
+func TestThemeRegistration(t *testing.T) {
+	// Get list of available themes
+	availableThemes := AvailableThemes()
+
+	// Check if "catppuccin" theme is registered
+	catppuccinFound := false
+	for _, themeName := range availableThemes {
+		if themeName == "catppuccin" {
+			catppuccinFound = true
+			break
+		}
+	}
+
+	if !catppuccinFound {
+		t.Errorf("Catppuccin theme is not registered")
+	}
+
+	// Check if "gruvbox" theme is registered
+	gruvboxFound := false
+	for _, themeName := range availableThemes {
+		if themeName == "gruvbox" {
+			gruvboxFound = true
+			break
+		}
+	}
+
+	if !gruvboxFound {
+		t.Errorf("Gruvbox theme is not registered")
+	}
+
+	// Check if "monokai" theme is registered
+	monokaiFound := false
+	for _, themeName := range availableThemes {
+		if themeName == "monokai" {
+			monokaiFound = true
+			break
+		}
+	}
+
+	if !monokaiFound {
+		t.Errorf("Monokai theme is not registered")
+	}
+
+	// Try to get the themes and make sure they're not nil
+	catppuccin := GetTheme("catppuccin")
+	if catppuccin == nil {
+		t.Errorf("Catppuccin theme is nil")
+	}
+
+	gruvbox := GetTheme("gruvbox")
+	if gruvbox == nil {
+		t.Errorf("Gruvbox theme is nil")
+	}
+
+	monokai := GetTheme("monokai")
+	if monokai == nil {
+		t.Errorf("Monokai theme is nil")
+	}
+
+	// Test switching theme
+	originalTheme := CurrentThemeName()
+
+	err := SetTheme("gruvbox")
+	if err != nil {
+		t.Errorf("Failed to set theme to gruvbox: %v", err)
+	}
+
+	if CurrentThemeName() != "gruvbox" {
+		t.Errorf("Theme not properly switched to gruvbox")
+	}
+
+	err = SetTheme("monokai")
+	if err != nil {
+		t.Errorf("Failed to set theme to monokai: %v", err)
+	}
+
+	if CurrentThemeName() != "monokai" {
+		t.Errorf("Theme not properly switched to monokai")
+	}
+
+	// Switch back to original theme
+	_ = SetTheme(originalTheme)
+}

pkg/tui/theme/tokyonight.go

@@ -0,0 +1,274 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// TokyoNightTheme implements the Theme interface with Tokyo Night colors.
+// It provides both dark and light variants.
+type TokyoNightTheme struct {
+	BaseTheme
+}
+
+// NewTokyoNightTheme creates a new instance of the Tokyo Night theme.
+func NewTokyoNightTheme() *TokyoNightTheme {
+	// Tokyo Night color palette
+	// Dark mode colors
+	darkBackground := "#222436"
+	darkCurrentLine := "#1e2030"
+	darkSelection := "#2f334d"
+	darkForeground := "#c8d3f5"
+	darkComment := "#636da6"
+	darkRed := "#ff757f"
+	darkOrange := "#ff966c"
+	darkYellow := "#ffc777"
+	darkGreen := "#c3e88d"
+	darkCyan := "#86e1fc"
+	darkBlue := "#82aaff"
+	darkPurple := "#c099ff"
+	darkBorder := "#3b4261"
+
+	// Light mode colors (Tokyo Night Day)
+	lightBackground := "#e1e2e7"
+	lightCurrentLine := "#d5d6db"
+	lightSelection := "#c8c9ce"
+	lightForeground := "#3760bf"
+	lightComment := "#848cb5"
+	lightRed := "#f52a65"
+	lightOrange := "#b15c00"
+	lightYellow := "#8c6c3e"
+	lightGreen := "#587539"
+	lightCyan := "#007197"
+	lightBlue := "#2e7de9"
+	lightPurple := "#9854f1"
+	lightBorder := "#a8aecb"
+
+	theme := &TokyoNightTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkCurrentLine,
+		Light: lightCurrentLine,
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  "#191B29", // Darker background from palette
+		Light: "#f0f0f5", // Slightly lighter than background
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  darkBorder,
+		Light: lightBorder,
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  darkSelection,
+		Light: lightSelection,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#4fd6be", // teal from palette
+		Light: "#1e725c",
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#c53b53", // red1 from palette
+		Light: "#c53b53",
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  "#828bb8", // fg_dark from palette
+		Light: "#7086b5",
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  "#828bb8", // fg_dark from palette
+		Light: "#7086b5",
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#b8db87", // git.add from palette
+		Light: "#4db380",
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#e26a75", // git.delete from palette
+		Light: "#f52a65",
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#20303b",
+		Light: "#d5e5d5",
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#37222c",
+		Light: "#f7d8db",
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  "#545c7e", // dark3 from palette
+		Light: "#848cb5",
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#1b2b34",
+		Light: "#c5d5c5",
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#2d1f26",
+		Light: "#e7c8cb",
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Tokyo Night theme with the theme manager
+	RegisterTheme("tokyonight", NewTokyoNightTheme())
+}

pkg/tui/theme/tron.go

@@ -0,0 +1,276 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// TronTheme implements the Theme interface with Tron-inspired colors.
+// It provides both dark and light variants, though Tron is primarily a dark theme.
+type TronTheme struct {
+	BaseTheme
+}
+
+// NewTronTheme creates a new instance of the Tron theme.
+func NewTronTheme() *TronTheme {
+	// Tron color palette
+	// Inspired by the Tron movie's neon aesthetic
+	darkBackground := "#0c141f"
+	darkCurrentLine := "#1a2633"
+	darkSelection := "#1a2633"
+	darkForeground := "#caf0ff"
+	darkComment := "#4d6b87"
+	darkCyan := "#00d9ff"
+	darkBlue := "#007fff"
+	darkOrange := "#ff9000"
+	darkPink := "#ff00a0"
+	darkPurple := "#b73fff"
+	darkRed := "#ff3333"
+	darkYellow := "#ffcc00"
+	darkGreen := "#00ff8f"
+	darkBorder := "#1a2633"
+
+	// Light mode approximation
+	lightBackground := "#f0f8ff"
+	lightCurrentLine := "#e0f0ff"
+	lightSelection := "#d0e8ff"
+	lightForeground := "#0c141f"
+	lightComment := "#4d6b87"
+	lightCyan := "#0097b3"
+	lightBlue := "#0066cc"
+	lightOrange := "#cc7300"
+	lightPink := "#cc0080"
+	lightPurple := "#9932cc"
+	lightRed := "#cc2929"
+	lightYellow := "#cc9900"
+	lightGreen := "#00cc72"
+	lightBorder := "#d0e8ff"
+
+	theme := &TronTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkCurrentLine,
+		Light: lightCurrentLine,
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  "#070d14", // Slightly darker than background
+		Light: "#ffffff", // Slightly lighter than background
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  darkBorder,
+		Light: lightBorder,
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  darkSelection,
+		Light: lightSelection,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#00ff8f",
+		Light: "#a5d6a7",
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#ff3333",
+		Light: "#ef9a9a",
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#0a2a1a",
+		Light: "#e8f5e9",
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#2a0a0a",
+		Light: "#ffebee",
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#082015",
+		Light: "#c8e6c9",
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#200808",
+		Light: "#ffcdd2",
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkBlue,
+		Light: lightBlue,
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Tron theme with the theme manager
+	RegisterTheme("tron", NewTronTheme())
+}

pkg/tui/tui.go

@@ -0,0 +1,1023 @@
+package tui
+
+import (
+	"context"
+	"fmt"
+	"log/slog"
+	"strings"
+
+	"github.com/charmbracelet/bubbles/cursor"
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/spinner"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/config"
+	"github.com/sst/opencode/internal/llm/agent"
+	"github.com/sst/opencode/internal/logging"
+	"github.com/sst/opencode/internal/message"
+	"github.com/sst/opencode/internal/permission"
+	"github.com/sst/opencode/internal/pubsub"
+	"github.com/sst/opencode/internal/session"
+	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/tui/components/chat"
+	"github.com/sst/opencode/internal/tui/components/core"
+	"github.com/sst/opencode/internal/tui/components/dialog"
+	"github.com/sst/opencode/internal/tui/components/logs"
+	"github.com/sst/opencode/internal/tui/layout"
+	"github.com/sst/opencode/internal/tui/page"
+	"github.com/sst/opencode/internal/tui/state"
+	"github.com/sst/opencode/internal/tui/util"
+	"github.com/sst/opencode/pkg/client"
+)
+
+type keyMap struct {
+	Logs          key.Binding
+	Quit          key.Binding
+	Help          key.Binding
+	SwitchSession key.Binding
+	Commands      key.Binding
+	Filepicker    key.Binding
+	Models        key.Binding
+	SwitchTheme   key.Binding
+	Tools         key.Binding
+}
+
+const (
+	quitKey = "q"
+)
+
+var keys = keyMap{
+	Logs: key.NewBinding(
+		key.WithKeys("ctrl+l"),
+		key.WithHelp("ctrl+l", "logs"),
+	),
+
+	Quit: key.NewBinding(
+		key.WithKeys("ctrl+c"),
+		key.WithHelp("ctrl+c", "quit"),
+	),
+	Help: key.NewBinding(
+		key.WithKeys("ctrl+_"),
+		key.WithHelp("ctrl+?", "toggle help"),
+	),
+
+	SwitchSession: key.NewBinding(
+		key.WithKeys("ctrl+s"),
+		key.WithHelp("ctrl+s", "switch session"),
+	),
+
+	Commands: key.NewBinding(
+		key.WithKeys("ctrl+k"),
+		key.WithHelp("ctrl+k", "commands"),
+	),
+	Filepicker: key.NewBinding(
+		key.WithKeys("ctrl+f"),
+		key.WithHelp("ctrl+f", "select files to upload"),
+	),
+	Models: key.NewBinding(
+		key.WithKeys("ctrl+o"),
+		key.WithHelp("ctrl+o", "model selection"),
+	),
+
+	SwitchTheme: key.NewBinding(
+		key.WithKeys("ctrl+t"),
+		key.WithHelp("ctrl+t", "switch theme"),
+	),
+
+	Tools: key.NewBinding(
+		key.WithKeys("f9"),
+		key.WithHelp("f9", "show available tools"),
+	),
+}
+
+var helpEsc = key.NewBinding(
+	key.WithKeys("?"),
+	key.WithHelp("?", "toggle help"),
+)
+
+var returnKey = key.NewBinding(
+	key.WithKeys("esc"),
+	key.WithHelp("esc", "close"),
+)
+
+var logsKeyReturnKey = key.NewBinding(
+	key.WithKeys("esc", "backspace", quitKey),
+	key.WithHelp("esc/q", "go back"),
+)
+
+type appModel struct {
+	width, height int
+	currentPage   page.PageID
+	previousPage  page.PageID
+	pages         map[page.PageID]tea.Model
+	loadedPages   map[page.PageID]bool
+	status        core.StatusCmp
+	app           *app.App
+
+	showPermissions bool
+	permissions     dialog.PermissionDialogCmp
+
+	showHelp bool
+	help     dialog.HelpCmp
+
+	showQuit bool
+	quit     dialog.QuitDialog
+
+	showSessionDialog bool
+	sessionDialog     dialog.SessionDialog
+
+	showCommandDialog bool
+	commandDialog     dialog.CommandDialog
+	commands          []dialog.Command
+
+	showModelDialog bool
+	modelDialog     dialog.ModelDialog
+
+	showInitDialog bool
+	initDialog     dialog.InitDialogCmp
+
+	showFilepicker bool
+	filepicker     dialog.FilepickerCmp
+
+	showThemeDialog bool
+	themeDialog     dialog.ThemeDialog
+
+	showMultiArgumentsDialog bool
+	multiArgumentsDialog     dialog.MultiArgumentsDialogCmp
+
+	showToolsDialog bool
+	toolsDialog     dialog.ToolsDialog
+}
+
+func (a appModel) Init() tea.Cmd {
+	var cmds []tea.Cmd
+	cmd := a.pages[a.currentPage].Init()
+	a.loadedPages[a.currentPage] = true
+	cmds = append(cmds, cmd)
+	cmd = a.status.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.quit.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.help.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.sessionDialog.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.commandDialog.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.modelDialog.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.initDialog.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.filepicker.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.themeDialog.Init()
+	cmds = append(cmds, cmd)
+	cmd = a.toolsDialog.Init()
+	cmds = append(cmds, cmd)
+
+	// Check if we should show the init dialog
+	cmds = append(cmds, func() tea.Msg {
+		shouldShow, err := config.ShouldShowInitDialog()
+		if err != nil {
+			status.Error("Failed to check init status: " + err.Error())
+			return nil
+		}
+		return dialog.ShowInitDialogMsg{Show: shouldShow}
+	})
+
+	return tea.Batch(cmds...)
+}
+
+func (a appModel) updateAllPages(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	var cmd tea.Cmd
+	for id, _ := range a.pages {
+		a.pages[id], cmd = a.pages[id].Update(msg)
+		cmds = append(cmds, cmd)
+	}
+	return a, tea.Batch(cmds...)
+}
+
+func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+	var cmd tea.Cmd
+	switch msg := msg.(type) {
+	case cursor.BlinkMsg:
+		return a.updateAllPages(msg)
+	case spinner.TickMsg:
+		return a.updateAllPages(msg)
+
+	case tea.WindowSizeMsg:
+		msg.Height -= 2 // Make space for the status bar
+		a.width, a.height = msg.Width, msg.Height
+
+		s, _ := a.status.Update(msg)
+		a.status = s.(core.StatusCmp)
+		a.pages[a.currentPage], cmd = a.pages[a.currentPage].Update(msg)
+		cmds = append(cmds, cmd)
+
+		prm, permCmd := a.permissions.Update(msg)
+		a.permissions = prm.(dialog.PermissionDialogCmp)
+		cmds = append(cmds, permCmd)
+
+		help, helpCmd := a.help.Update(msg)
+		a.help = help.(dialog.HelpCmp)
+		cmds = append(cmds, helpCmd)
+
+		session, sessionCmd := a.sessionDialog.Update(msg)
+		a.sessionDialog = session.(dialog.SessionDialog)
+		cmds = append(cmds, sessionCmd)
+
+		command, commandCmd := a.commandDialog.Update(msg)
+		a.commandDialog = command.(dialog.CommandDialog)
+		cmds = append(cmds, commandCmd)
+
+		filepicker, filepickerCmd := a.filepicker.Update(msg)
+		a.filepicker = filepicker.(dialog.FilepickerCmp)
+		cmds = append(cmds, filepickerCmd)
+
+		a.initDialog.SetSize(msg.Width, msg.Height)
+
+		if a.showMultiArgumentsDialog {
+			a.multiArgumentsDialog.SetSize(msg.Width, msg.Height)
+			args, argsCmd := a.multiArgumentsDialog.Update(msg)
+			a.multiArgumentsDialog = args.(dialog.MultiArgumentsDialogCmp)
+			cmds = append(cmds, argsCmd, a.multiArgumentsDialog.Init())
+		}
+
+		return a, tea.Batch(cmds...)
+
+	case pubsub.Event[permission.PermissionRequest]:
+		a.showPermissions = true
+		return a, a.permissions.SetPermissions(msg.Payload)
+	case dialog.PermissionResponseMsg:
+		var cmd tea.Cmd
+		switch msg.Action {
+		case dialog.PermissionAllow:
+			a.app.Permissions.Grant(context.Background(), msg.Permission)
+		case dialog.PermissionAllowForSession:
+			a.app.Permissions.GrantPersistant(context.Background(), msg.Permission)
+		case dialog.PermissionDeny:
+			a.app.Permissions.Deny(context.Background(), msg.Permission)
+		}
+		a.showPermissions = false
+		return a, cmd
+
+	case page.PageChangeMsg:
+		return a, a.moveToPage(msg.ID)
+
+	case logs.LogsLoadedMsg:
+		a.pages[page.LogsPage], cmd = a.pages[page.LogsPage].Update(msg)
+		cmds = append(cmds, cmd)
+
+	case state.SessionSelectedMsg:
+		a.app.CurrentSession = msg
+		return a.updateAllPages(msg)
+
+	case pubsub.Event[session.Session]:
+		if msg.Type == session.EventSessionUpdated {
+			if a.app.CurrentSession.ID == msg.Payload.ID {
+				a.app.CurrentSession = &msg.Payload
+			}
+		}
+
+	case dialog.CloseQuitMsg:
+		a.showQuit = false
+		return a, nil
+
+	case dialog.CloseSessionDialogMsg:
+		a.showSessionDialog = false
+		if msg.Session != nil {
+			return a, util.CmdHandler(state.SessionSelectedMsg(msg.Session))
+		}
+		return a, nil
+
+	case dialog.CloseCommandDialogMsg:
+		a.showCommandDialog = false
+		return a, nil
+
+	case dialog.CloseThemeDialogMsg:
+		a.showThemeDialog = false
+		return a, nil
+
+	case dialog.CloseToolsDialogMsg:
+		a.showToolsDialog = false
+		return a, nil
+
+	case dialog.ShowToolsDialogMsg:
+		a.showToolsDialog = msg.Show
+		return a, nil
+
+	case dialog.ThemeChangedMsg:
+		a.pages[a.currentPage], cmd = a.pages[a.currentPage].Update(msg)
+		a.showThemeDialog = false
+		status.Info("Theme changed to: " + msg.ThemeName)
+		return a, cmd
+
+	case dialog.CloseModelDialogMsg:
+		a.showModelDialog = false
+		return a, nil
+
+	case dialog.ModelSelectedMsg:
+		a.showModelDialog = false
+
+		model, err := a.app.PrimaryAgent.Update(config.AgentPrimary, msg.Model.ID)
+		if err != nil {
+			status.Error(err.Error())
+			return a, nil
+		}
+
+		status.Info(fmt.Sprintf("Model changed to %s", model.Name))
+		return a, nil
+
+	case dialog.ShowInitDialogMsg:
+		a.showInitDialog = msg.Show
+		return a, nil
+
+	case dialog.CloseInitDialogMsg:
+		a.showInitDialog = false
+		if msg.Initialize {
+			// Run the initialization command
+			for _, cmd := range a.commands {
+				if cmd.ID == "init" {
+					// Mark the project as initialized
+					if err := config.MarkProjectInitialized(); err != nil {
+						status.Error(err.Error())
+						return a, nil
+					}
+					return a, cmd.Handler(cmd)
+				}
+			}
+		} else {
+			// Mark the project as initialized without running the command
+			if err := config.MarkProjectInitialized(); err != nil {
+				status.Error(err.Error())
+				return a, nil
+			}
+		}
+		return a, nil
+
+	case dialog.CommandSelectedMsg:
+		a.showCommandDialog = false
+		// Execute the command handler if available
+		if msg.Command.Handler != nil {
+			return a, msg.Command.Handler(msg.Command)
+		}
+		status.Info("Command selected: " + msg.Command.Title)
+		return a, nil
+
+	case dialog.ShowMultiArgumentsDialogMsg:
+		// Show multi-arguments dialog
+		a.multiArgumentsDialog = dialog.NewMultiArgumentsDialogCmp(msg.CommandID, msg.Content, msg.ArgNames)
+		a.showMultiArgumentsDialog = true
+		return a, a.multiArgumentsDialog.Init()
+
+	case dialog.CloseMultiArgumentsDialogMsg:
+		// Close multi-arguments dialog
+		a.showMultiArgumentsDialog = false
+
+		// If submitted, replace all named arguments and run the command
+		if msg.Submit {
+			content := msg.Content
+
+			// Replace each named argument with its value
+			for name, value := range msg.Args {
+				placeholder := "$" + name
+				content = strings.ReplaceAll(content, placeholder, value)
+			}
+
+			// Execute the command with arguments
+			return a, util.CmdHandler(dialog.CommandRunCustomMsg{
+				Content: content,
+				Args:    msg.Args,
+			})
+		}
+		return a, nil
+
+	case tea.KeyMsg:
+		// If multi-arguments dialog is open, let it handle the key press first
+		if a.showMultiArgumentsDialog {
+			args, cmd := a.multiArgumentsDialog.Update(msg)
+			a.multiArgumentsDialog = args.(dialog.MultiArgumentsDialogCmp)
+			return a, cmd
+		}
+
+		switch {
+		case key.Matches(msg, keys.Quit):
+			a.showQuit = !a.showQuit
+			if a.showHelp {
+				a.showHelp = false
+			}
+			if a.showSessionDialog {
+				a.showSessionDialog = false
+			}
+			if a.showCommandDialog {
+				a.showCommandDialog = false
+			}
+			if a.showFilepicker {
+				a.showFilepicker = false
+				a.filepicker.ToggleFilepicker(a.showFilepicker)
+			}
+			if a.showModelDialog {
+				a.showModelDialog = false
+			}
+			if a.showMultiArgumentsDialog {
+				a.showMultiArgumentsDialog = false
+			}
+			if a.showToolsDialog {
+				a.showToolsDialog = false
+			}
+			return a, nil
+		case key.Matches(msg, keys.SwitchSession):
+			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions && !a.showCommandDialog {
+				// Close other dialogs
+				a.showToolsDialog = false
+				a.showThemeDialog = false
+				a.showModelDialog = false
+				a.showFilepicker = false
+
+				// Load sessions and show the dialog
+				sessions, err := a.app.Sessions.List(context.Background())
+				if err != nil {
+					status.Error(err.Error())
+					return a, nil
+				}
+				if len(sessions) == 0 {
+					status.Warn("No sessions available")
+					return a, nil
+				}
+				a.sessionDialog.SetSessions(sessions)
+				a.showSessionDialog = true
+				return a, nil
+			}
+			return a, nil
+		case key.Matches(msg, keys.Commands):
+			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions && !a.showSessionDialog && !a.showThemeDialog && !a.showFilepicker {
+				// Close other dialogs
+				a.showToolsDialog = false
+				a.showModelDialog = false
+
+				// Show commands dialog
+				if len(a.commands) == 0 {
+					status.Warn("No commands available")
+					return a, nil
+				}
+				a.commandDialog.SetCommands(a.commands)
+				a.showCommandDialog = true
+				return a, nil
+			}
+			return a, nil
+		case key.Matches(msg, keys.Models):
+			if a.showModelDialog {
+				a.showModelDialog = false
+				return a, nil
+			}
+			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions && !a.showSessionDialog && !a.showCommandDialog {
+				// Close other dialogs
+				a.showToolsDialog = false
+				a.showThemeDialog = false
+				a.showFilepicker = false
+
+				a.showModelDialog = true
+				return a, nil
+			}
+			return a, nil
+		case key.Matches(msg, keys.SwitchTheme):
+			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions && !a.showSessionDialog && !a.showCommandDialog {
+				// Close other dialogs
+				a.showToolsDialog = false
+				a.showModelDialog = false
+				a.showFilepicker = false
+
+				a.showThemeDialog = true
+				return a, a.themeDialog.Init()
+			}
+			return a, nil
+		case key.Matches(msg, keys.Tools):
+			// Check if any other dialog is open
+			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions &&
+				!a.showSessionDialog && !a.showCommandDialog && !a.showThemeDialog &&
+				!a.showFilepicker && !a.showModelDialog && !a.showInitDialog &&
+				!a.showMultiArgumentsDialog {
+				// Toggle tools dialog
+				a.showToolsDialog = !a.showToolsDialog
+				if a.showToolsDialog {
+					// Get tool names dynamically
+					toolNames := getAvailableToolNames(a.app)
+					a.toolsDialog.SetTools(toolNames)
+				}
+				return a, nil
+			}
+			return a, nil
+		case key.Matches(msg, returnKey) || key.Matches(msg):
+			if msg.String() == quitKey {
+				if a.currentPage == page.LogsPage {
+					return a, a.moveToPage(page.ChatPage)
+				}
+			} else if !a.filepicker.IsCWDFocused() {
+				if a.showToolsDialog {
+					a.showToolsDialog = false
+					return a, nil
+				}
+				if a.showQuit {
+					a.showQuit = !a.showQuit
+					return a, nil
+				}
+				if a.showHelp {
+					a.showHelp = !a.showHelp
+					return a, nil
+				}
+				if a.showInitDialog {
+					a.showInitDialog = false
+					// Mark the project as initialized without running the command
+					if err := config.MarkProjectInitialized(); err != nil {
+						status.Error(err.Error())
+						return a, nil
+					}
+					return a, nil
+				}
+				if a.showFilepicker {
+					a.showFilepicker = false
+					a.filepicker.ToggleFilepicker(a.showFilepicker)
+					return a, nil
+				}
+				if a.currentPage == page.LogsPage {
+					// Always allow returning from logs page, even when agent is busy
+					return a, a.moveToPageUnconditional(page.ChatPage)
+				}
+			}
+		case key.Matches(msg, keys.Logs):
+			return a, a.moveToPage(page.LogsPage)
+		case key.Matches(msg, keys.Help):
+			if a.showQuit {
+				return a, nil
+			}
+			a.showHelp = !a.showHelp
+
+			// Close other dialogs if opening help
+			if a.showHelp {
+				a.showToolsDialog = false
+			}
+			return a, nil
+		case key.Matches(msg, helpEsc):
+			if a.app.PrimaryAgent.IsBusy() {
+				if a.showQuit {
+					return a, nil
+				}
+				a.showHelp = !a.showHelp
+				return a, nil
+			}
+		case key.Matches(msg, keys.Filepicker):
+			// Toggle filepicker
+			a.showFilepicker = !a.showFilepicker
+			a.filepicker.ToggleFilepicker(a.showFilepicker)
+
+			// Close other dialogs if opening filepicker
+			if a.showFilepicker {
+				a.showToolsDialog = false
+				a.showThemeDialog = false
+				a.showModelDialog = false
+				a.showCommandDialog = false
+				a.showSessionDialog = false
+			}
+			return a, nil
+		}
+
+	case pubsub.Event[logging.Log]:
+		a.pages[page.LogsPage], cmd = a.pages[page.LogsPage].Update(msg)
+		cmds = append(cmds, cmd)
+		return a, tea.Batch(cmds...)
+
+	case pubsub.Event[message.Message]:
+		a.pages[page.ChatPage], cmd = a.pages[page.ChatPage].Update(msg)
+		cmds = append(cmds, cmd)
+		return a, tea.Batch(cmds...)
+
+	default:
+		f, filepickerCmd := a.filepicker.Update(msg)
+		a.filepicker = f.(dialog.FilepickerCmp)
+		cmds = append(cmds, filepickerCmd)
+	}
+
+	if a.showFilepicker {
+		f, filepickerCmd := a.filepicker.Update(msg)
+		a.filepicker = f.(dialog.FilepickerCmp)
+		cmds = append(cmds, filepickerCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	if a.showQuit {
+		q, quitCmd := a.quit.Update(msg)
+		a.quit = q.(dialog.QuitDialog)
+		cmds = append(cmds, quitCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	if a.showPermissions {
+		d, permissionsCmd := a.permissions.Update(msg)
+		a.permissions = d.(dialog.PermissionDialogCmp)
+		cmds = append(cmds, permissionsCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	if a.showSessionDialog {
+		d, sessionCmd := a.sessionDialog.Update(msg)
+		a.sessionDialog = d.(dialog.SessionDialog)
+		cmds = append(cmds, sessionCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	if a.showCommandDialog {
+		d, commandCmd := a.commandDialog.Update(msg)
+		a.commandDialog = d.(dialog.CommandDialog)
+		cmds = append(cmds, commandCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	if a.showModelDialog {
+		d, modelCmd := a.modelDialog.Update(msg)
+		a.modelDialog = d.(dialog.ModelDialog)
+		cmds = append(cmds, modelCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	if a.showInitDialog {
+		d, initCmd := a.initDialog.Update(msg)
+		a.initDialog = d.(dialog.InitDialogCmp)
+		cmds = append(cmds, initCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	if a.showThemeDialog {
+		d, themeCmd := a.themeDialog.Update(msg)
+		a.themeDialog = d.(dialog.ThemeDialog)
+		cmds = append(cmds, themeCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	if a.showToolsDialog {
+		d, toolsCmd := a.toolsDialog.Update(msg)
+		a.toolsDialog = d.(dialog.ToolsDialog)
+		cmds = append(cmds, toolsCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
+	s, cmd := a.status.Update(msg)
+	cmds = append(cmds, cmd)
+	a.status = s.(core.StatusCmp)
+
+	a.pages[a.currentPage], cmd = a.pages[a.currentPage].Update(msg)
+	cmds = append(cmds, cmd)
+	return a, tea.Batch(cmds...)
+}
+
+// RegisterCommand adds a command to the command dialog
+func (a *appModel) RegisterCommand(cmd dialog.Command) {
+	a.commands = append(a.commands, cmd)
+}
+
+// getAvailableToolNames returns a list of all available tool names
+func getAvailableToolNames(app *app.App) []string {
+	// Get primary agent tools (which already include MCP tools)
+	allTools := agent.PrimaryAgentTools(
+		app.Permissions,
+		app.Sessions,
+		app.Messages,
+		app.History,
+		app.LSPClients,
+	)
+
+	// Extract tool names
+	var toolNames []string
+	for _, tool := range allTools {
+		toolNames = append(toolNames, tool.Info().Name)
+	}
+
+	return toolNames
+}
+
+func (a *appModel) moveToPage(pageID page.PageID) tea.Cmd {
+	// Allow navigating to logs page even when agent is busy
+	if a.app.PrimaryAgent.IsBusy() && pageID != page.LogsPage {
+		// Don't move to other pages if the agent is busy
+		status.Warn("Agent is busy, please wait...")
+		return nil
+	}
+
+	return a.moveToPageUnconditional(pageID)
+}
+
+// moveToPageUnconditional is like moveToPage but doesn't check if the agent is busy
+func (a *appModel) moveToPageUnconditional(pageID page.PageID) tea.Cmd {
+	var cmds []tea.Cmd
+	if _, ok := a.loadedPages[pageID]; !ok {
+		cmd := a.pages[pageID].Init()
+		cmds = append(cmds, cmd)
+		a.loadedPages[pageID] = true
+	}
+	a.previousPage = a.currentPage
+	a.currentPage = pageID
+	if sizable, ok := a.pages[a.currentPage].(layout.Sizeable); ok {
+		cmd := sizable.SetSize(a.width, a.height)
+		cmds = append(cmds, cmd)
+	}
+
+	return tea.Batch(cmds...)
+}
+
+func (a appModel) View() string {
+	components := []string{
+		a.pages[a.currentPage].View(),
+	}
+
+	components = append(components, a.status.View())
+
+	appView := lipgloss.JoinVertical(lipgloss.Top, components...)
+
+	if a.showPermissions {
+		overlay := a.permissions.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showFilepicker {
+		overlay := a.filepicker.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+
+	}
+
+	if !a.app.PrimaryAgent.IsBusy() {
+		a.status.SetHelpWidgetMsg("ctrl+? help")
+	} else {
+		a.status.SetHelpWidgetMsg("? help")
+	}
+
+	if a.showHelp {
+		bindings := layout.KeyMapToSlice(keys)
+		if p, ok := a.pages[a.currentPage].(layout.Bindings); ok {
+			bindings = append(bindings, p.BindingKeys()...)
+		}
+		if a.showPermissions {
+			bindings = append(bindings, a.permissions.BindingKeys()...)
+		}
+		if a.currentPage == page.LogsPage {
+			bindings = append(bindings, logsKeyReturnKey)
+		}
+		if !a.app.PrimaryAgent.IsBusy() {
+			bindings = append(bindings, helpEsc)
+		}
+		a.help.SetBindings(bindings)
+
+		overlay := a.help.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showQuit {
+		overlay := a.quit.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showSessionDialog {
+		overlay := a.sessionDialog.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showModelDialog {
+		overlay := a.modelDialog.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showCommandDialog {
+		overlay := a.commandDialog.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showInitDialog {
+		overlay := a.initDialog.View()
+		appView = layout.PlaceOverlay(
+			a.width/2-lipgloss.Width(overlay)/2,
+			a.height/2-lipgloss.Height(overlay)/2,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showThemeDialog {
+		overlay := a.themeDialog.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showMultiArgumentsDialog {
+		overlay := a.multiArgumentsDialog.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	if a.showToolsDialog {
+		overlay := a.toolsDialog.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
+	return appView
+}
+
+func New(app *app.App) tea.Model {
+	startPage := page.ChatPage
+	model := &appModel{
+		currentPage:   startPage,
+		loadedPages:   make(map[page.PageID]bool),
+		status:        core.NewStatusCmp(app),
+		help:          dialog.NewHelpCmp(),
+		quit:          dialog.NewQuitCmp(),
+		sessionDialog: dialog.NewSessionDialogCmp(),
+		commandDialog: dialog.NewCommandDialogCmp(),
+		modelDialog:   dialog.NewModelDialogCmp(),
+		permissions:   dialog.NewPermissionDialogCmp(),
+		initDialog:    dialog.NewInitDialogCmp(),
+		themeDialog:   dialog.NewThemeDialogCmp(),
+		toolsDialog:   dialog.NewToolsDialogCmp(),
+		app:           app,
+		commands:      []dialog.Command{},
+		pages: map[page.PageID]tea.Model{
+			page.ChatPage: page.NewChatPage(app),
+			page.LogsPage: page.NewLogsPage(app),
+		},
+		filepicker: dialog.NewFilepickerCmp(app),
+	}
+
+	model.RegisterCommand(dialog.Command{
+		ID:          "init",
+		Title:       "Initialize Project",
+		Description: "Create/Update the CONTEXT.md memory file",
+		Handler: func(cmd dialog.Command) tea.Cmd {
+			prompt := `Please analyze this codebase and create a CONTEXT.md file containing:
+1. Build/lint/test commands - especially for running a single test
+2. Code style guidelines including imports, formatting, types, naming conventions, error handling, etc.
+
+The file you create will be given to agentic coding agents (such as yourself) that operate in this repository. Make it about 20 lines long.
+If there's already a CONTEXT.md, improve it.
+If there are Cursor rules (in .cursor/rules/ or .cursorrules) or Copilot rules (in .github/copilot-instructions.md), make sure to include them.`
+			return tea.Batch(
+				util.CmdHandler(chat.SendMsg{
+					Text: prompt,
+				}),
+			)
+		},
+	})
+
+	model.RegisterCommand(dialog.Command{
+		ID:          "compact_conversation",
+		Title:       "Compact Conversation",
+		Description: "Summarize the current session to save tokens",
+		Handler: func(cmd dialog.Command) tea.Cmd {
+			// Get the current session from the appModel
+			if model.currentPage != page.ChatPage {
+				status.Warn("Please navigate to a chat session first.")
+				return nil
+			}
+
+			// Return a message that will be handled by the chat page
+			status.Info("Compacting conversation...")
+			return util.CmdHandler(state.CompactSessionMsg{})
+		},
+	})
+
+	// Load custom commands
+	customCommands, err := dialog.LoadCustomCommands()
+	if err != nil {
+		slog.Warn("Failed to load custom commands", "error", err)
+	} else {
+		for _, cmd := range customCommands {
+			model.RegisterCommand(cmd)
+		}
+	}
+
+	return model
+}

pkg/tui/util/util.go

@@ -0,0 +1,18 @@
+package util
+
+import (
+	tea "github.com/charmbracelet/bubbletea"
+)
+
+func CmdHandler(msg tea.Msg) tea.Cmd {
+	return func() tea.Msg {
+		return msg
+	}
+}
+
+func Clamp(v, low, high int) int {
+	if high < low {
+		low, high = high, low
+	}
+	return min(high, max(low, v))
+}