public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-no-use-of-apply-file-diffs' into 'master'

Browse Source 
fix no use of apply_file_diffs tool

See merge request samnasbo/shared/galaxy!1
This commit is contained in:
Ryan Ward
2026-05-26 16:31:54 -05:00
parent a0568508ea 0f969f4389
commit d55befec1c
5 changed files with 1065 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1 -1
View File
@@ -5191,7 +5191,7 @@ dependencies = [
[[package]] [[package]]
name = "galaxy" name = "galaxy"
version = "1.3.0" version = "1.5.2"
dependencies = [ dependencies = [
"addr", "addr",
"aho-corasick", "aho-corasick",
app/Cargo.toml
+1 -1
View File
@@ -5,7 +5,7 @@ description = "Galaxy - AI-powered terminal"
edition = "2021" edition = "2021"
autobins = false autobins = false
name = "galaxy" name = "galaxy"
version = "1.5.1" version = "1.5.2"
publish.workspace = true publish.workspace = true
license.workspace = true license.workspace = true
app/src/ai/bedrock/convert_request.rs
+1053
View File
File diff suppressed because it is too large Load Diff
script/macos/run
+8 -8
View File
@@ -22,11 +22,11 @@ cd "${REPO_ROOT}"
: "${FEATURES:?FEATURES must be set (invoke via ./script/run)}" : "${FEATURES:?FEATURES must be set (invoke via ./script/run)}"
if [ "$WARP_CHANNEL" = "local" ]; then if [ "$WARP_CHANNEL" = "local" ]; then
WARP_APP_PATH="target/debug/bundle/osx/WarpLocal.app" WARP_APP_PATH="target/debug/bundle/osx/Galaxy Local.app"
WARP_SCHEME_NAME="warplocal" WARP_SCHEME_NAME="galaxylocal"
else else
WARP_APP_PATH="target/debug/bundle/osx/WarpOss.app" WARP_APP_PATH="target/debug/bundle/osx/Galaxy.app"
WARP_SCHEME_NAME="warposs" WARP_SCHEME_NAME="galaxyoss"
fi fi
DONT_OPEN=false DONT_OPEN=false
# Launches the binary with "open", meaning the Warp process is # Launches the binary with "open", meaning the Warp process is
@@ -60,9 +60,9 @@ while (( "$#" )); do
--release) --release)
echo "Detected release build, pointing at release bundle under target/release/bundle" echo "Detected release build, pointing at release bundle under target/release/bundle"
if [ "$WARP_CHANNEL" = "local" ]; then if [ "$WARP_CHANNEL" = "local" ]; then
WARP_APP_PATH="target/release/bundle/osx/WarpLocal.app" WARP_APP_PATH="target/release/bundle/osx/Galaxy Local.app"
else else
WARP_APP_PATH="target/release/bundle/osx/WarpOss.app" WARP_APP_PATH="target/release/bundle/osx/Galaxy.app"
fi fi
PARAMS="$PARAMS $1" PARAMS="$PARAMS $1"
shift shift
@@ -71,9 +71,9 @@ while (( "$#" )); do
PROFILE="$2" PROFILE="$2"
shift 2 shift 2
if [ "$WARP_CHANNEL" = "local" ]; then if [ "$WARP_CHANNEL" = "local" ]; then
WARP_APP_PATH="target/${PROFILE}/bundle/osx/WarpLocal.app" WARP_APP_PATH="target/${PROFILE}/bundle/osx/Galaxy Local.app"
else else
WARP_APP_PATH="target/${PROFILE}/bundle/osx/WarpOss.app" WARP_APP_PATH="target/${PROFILE}/bundle/osx/Galaxy.app"
fi fi
PARAMS="$PARAMS --profile $PROFILE" PARAMS="$PARAMS --profile $PROFILE"
;; ;;
script/run
+2 -2
View File
@@ -24,10 +24,10 @@ FEATURES="gui"
# If warp_channel_config is on PATH, build the Local channel binary; otherwise build the OSS channel. # If warp_channel_config is on PATH, build the Local channel binary; otherwise build the OSS channel.
if command -v warp-channel-config &>/dev/null; then if command -v warp-channel-config &>/dev/null; then
WARP_BIN_NAME="warp" WARP_BIN_NAME="galaxy-local"
WARP_CHANNEL="local" WARP_CHANNEL="local"
else else
WARP_BIN_NAME="warp-oss" WARP_BIN_NAME="galaxy-oss"
WARP_CHANNEL="oss" WARP_CHANNEL="oss"
fi fi