opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: update Makefile and devcontainer for improved build environment

Browse source 
- Refactor Makefile to use PIPELINE_GO for all Go command executions, allowing for optional execution through a devcontainer.
- Update devcontainer configuration to reflect the new project name "dragonscale" and adjust workspace folder settings.
- Enhance README with instructions for running eval commands within the devcontainer and clarify the use of DEVCONTAINER_EXEC for host execution.
- Modify eval scripts to utilize a dynamic NPM command variable for better flexibility in execution.
This commit is contained in:
ZanzyTHEbar 2026-02-21 22:40:51 +00:00
parent 7a7eab6403
commit b503fe08bf
5 changed files with 73 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.devcontainer/Dockerfile
View file

@ -28,5 +28,6 @@ USER ${USERNAME}
ENV GOPATH=/home/${USERNAME}/go ENV GOPATH=/home/${USERNAME}/go
ENV PATH=${GOPATH}/bin:${PATH} ENV PATH=${GOPATH}/bin:${PATH}
RUN go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest RUN go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest
WORKDIR /workspaces/picoclaw

4
.devcontainer/devcontainer.json
View file

@ -1,11 +1,11 @@
{ {
"name": "picoclaw-dev", "name": "dragonscale-dev",
"build": { "build": {
"dockerfile": "Dockerfile", "dockerfile": "Dockerfile",
"context": ".." "context": ".."
}, },
"remoteUser": "vscode", "remoteUser": "vscode",
"workspaceFolder": "/workspaces/picoclaw", "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"postCreateCommand": "make deps", "postCreateCommand": "make deps",
"customizations": { "customizations": {
"vscode": { "vscode": {

96
Makefile
View file

@ -12,13 +12,26 @@ MAIN_GO=$(CMD_DIR)/main.go
VERSION?=$(shell git describe --tags --always --dirty 2>/dev/null || echo "dev") VERSION?=$(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
GIT_COMMIT=$(shell git rev-parse --short=8 HEAD 2>/dev/null || echo "dev") GIT_COMMIT=$(shell git rev-parse --short=8 HEAD 2>/dev/null || echo "dev")
BUILD_TIME=$(shell date +%FT%T%z) BUILD_TIME=$(shell date +%FT%T%z)
GO_VERSION=$(shell $(GO) version | awk '{print $$3}') GO_VERSION=$(shell $(PIPELINE_GO) version | awk '{print $$3}')
LDFLAGS=-ldflags "-X main.version=$(VERSION) -X main.gitCommit=$(GIT_COMMIT) -X main.buildTime=$(BUILD_TIME) -X main.goVersion=$(GO_VERSION) -s -w" LDFLAGS=-ldflags "-X main.version=$(VERSION) -X main.gitCommit=$(GIT_COMMIT) -X main.buildTime=$(BUILD_TIME) -X main.goVersion=$(GO_VERSION) -s -w"
# Go variables # Go variables
GO?=go GO?=go
GOFLAGS?=-v -trimpath -tags stdjson GOFLAGS?=-v -trimpath -tags stdjson
# Go command execution can optionally run through the devcontainer to match build env.
HAS_NPX := $(shell command -v npx >/dev/null 2>&1; echo $$?)
DEVCONTAINER_EXEC ?=
ifeq ($(strip $(DEVCONTAINER_EXEC)),)
ifeq ($(HAS_NPX),0)
DEVCONTAINER_EXEC := npx --yes @devcontainers/cli exec --workspace-folder .
endif
endif
EVAL_BASH := $(if $(DEVCONTAINER_EXEC),$(DEVCONTAINER_EXEC) -- bash -lc,bash -lc)
PIPELINE_GO := $(if $(DEVCONTAINER_EXEC),$(DEVCONTAINER_EXEC) -- bash -lc 'git config --global --add safe.directory "$$PWD" >/dev/null 2>&1 || true; $(GO) "$$0" "$$@"',$(GO))
EVAL_GO := $(PIPELINE_GO)
EVAL_NPM := npx
# Installation # Installation
INSTALL_PREFIX?=$(HOME)/.local INSTALL_PREFIX?=$(HOME)/.local
INSTALL_BIN_DIR=$(INSTALL_PREFIX)/bin INSTALL_BIN_DIR=$(INSTALL_PREFIX)/bin
@ -71,14 +84,14 @@ all: build
generate: generate:
@echo "Run generate..." @echo "Run generate..."
@rm -r ./$(CMD_DIR)/workspace 2>/dev/null || true @rm -r ./$(CMD_DIR)/workspace 2>/dev/null || true
@$(GO) generate ./... @$(PIPELINE_GO) generate ./...
@echo "Run generate complete" @echo "Run generate complete"
## build: Build the dragonscale binary for current platform ## build: Build the dragonscale binary for current platform
build: generate build: generate
@echo "Building $(BINARY_NAME) for $(PLATFORM)/$(ARCH)..." @echo "Building $(BINARY_NAME) for $(PLATFORM)/$(ARCH)..."
@mkdir -p $(BUILD_DIR) @mkdir -p $(BUILD_DIR)
@$(GO) build $(GOFLAGS) $(LDFLAGS) -o $(BINARY_PATH) ./$(CMD_DIR) @$(PIPELINE_GO) build $(GOFLAGS) $(LDFLAGS) -o $(BINARY_PATH) ./$(CMD_DIR)
@echo "Build complete: $(BINARY_PATH)" @echo "Build complete: $(BINARY_PATH)"
@ln -sf $(BINARY_NAME)-$(PLATFORM)-$(ARCH) $(BUILD_DIR)/$(BINARY_NAME) @ln -sf $(BINARY_NAME)-$(PLATFORM)-$(ARCH) $(BUILD_DIR)/$(BINARY_NAME)
@ -86,12 +99,12 @@ build: generate
build-all: generate build-all: generate
@echo "Building for multiple platforms..." @echo "Building for multiple platforms..."
@mkdir -p $(BUILD_DIR) @mkdir -p $(BUILD_DIR)
GOOS=linux GOARCH=amd64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 ./$(CMD_DIR) GOOS=linux GOARCH=amd64 $(PIPELINE_GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 ./$(CMD_DIR)
GOOS=linux GOARCH=arm64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./$(CMD_DIR) GOOS=linux GOARCH=arm64 $(PIPELINE_GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./$(CMD_DIR)
GOOS=linux GOARCH=loong64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-loong64 ./$(CMD_DIR) GOOS=linux GOARCH=loong64 $(PIPELINE_GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-loong64 ./$(CMD_DIR)
GOOS=linux GOARCH=riscv64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-riscv64 ./$(CMD_DIR) GOOS=linux GOARCH=riscv64 $(PIPELINE_GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-linux-riscv64 ./$(CMD_DIR)
GOOS=darwin GOARCH=arm64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-arm64 ./$(CMD_DIR) GOOS=darwin GOARCH=arm64 $(PIPELINE_GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-arm64 ./$(CMD_DIR)
GOOS=windows GOARCH=amd64 $(GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR) GOOS=windows GOARCH=amd64 $(PIPELINE_GO) build $(LDFLAGS) -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR)
@echo "All builds complete" @echo "All builds complete"
## install: Install dragonscale to system and copy builtin skills ## install: Install dragonscale to system and copy builtin skills
@ -126,19 +139,19 @@ clean:
## vet: Run go vet for static analysis ## vet: Run go vet for static analysis
vet: vet:
@$(GO) vet ./... @$(PIPELINE_GO) vet ./...
## test: Run tests ## test: Run tests
test: test:
@$(GO) test ./... @$(PIPELINE_GO) test ./...
## fmt: Format Go code ## fmt: Format Go code
fmt: fmt:
@$(GO) fmt ./... @$(PIPELINE_GO) fmt ./...
## lint: Run all linting checks (format + vet + build) ## lint: Run all linting checks (format + vet + build)
lint: fmt vet lint: fmt vet
@$(GO) build ./... @$(PIPELINE_GO) build ./...
@echo "Lint OK" @echo "Lint OK"
## hooks: Install git pre-commit and commit-msg hooks ## hooks: Install git pre-commit and commit-msg hooks
@ -153,13 +166,13 @@ hooks:
## deps: Download dependencies ## deps: Download dependencies
deps: deps:
@$(GO) mod download @$(PIPELINE_GO) mod download
@$(GO) mod verify @$(PIPELINE_GO) mod verify
## update-deps: Update dependencies ## update-deps: Update dependencies
update-deps: update-deps:
@$(GO) get -u ./... @$(PIPELINE_GO) get -u ./...
@$(GO) mod tidy @$(PIPELINE_GO) mod tidy
## sqlc-check: Verify sqlc generation is idempotent for current tree ## sqlc-check: Verify sqlc generation is idempotent for current tree
sqlc-check: sqlc-check:
@ -193,7 +206,7 @@ flatc-check:
done; \ done; \
}; \ }; \
snapshot > "$$before"; \ snapshot > "$$before"; \
$(GO) generate ./pkg/itr ./pkg/tools; \ $(PIPELINE_GO) generate ./pkg/itr ./pkg/tools; \
snapshot > "$$after"; \ snapshot > "$$after"; \
if ! cmp -s "$$before" "$$after"; then \ if ! cmp -s "$$before" "$$after"; then \
echo "::error::FlatBuffers generated code is stale. Run 'go generate ./pkg/itr ./pkg/tools' and commit."; \ echo "::error::FlatBuffers generated code is stale. Run 'go generate ./pkg/itr ./pkg/tools' and commit."; \
@ -235,7 +248,7 @@ fantasy-patch:
## test-integration: Run integration tests (requires build tags) ## test-integration: Run integration tests (requires build tags)
test-integration: test-integration:
@echo "Running integration tests..." @echo "Running integration tests..."
@$(GO) test -tags integration -count=1 -timeout 120s -v ./pkg/memory/... @$(PIPELINE_GO) test -tags integration -count=1 -timeout 120s -v ./pkg/memory/...
@echo "Integration tests OK" @echo "Integration tests OK"
## check: Run vet, fmt, sqlc vet, and verify dependencies ## check: Run vet, fmt, sqlc vet, and verify dependencies
@ -268,40 +281,42 @@ devcontainer-verify:
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
## eval-build: Build the eval runner from the current branch ## eval-build: Build the eval runner from the current branch
eval-build: generate eval-build:
@echo "Building eval runner..." @echo "Building eval runner..."
@$(EVAL_GO) generate ./...
@mkdir -p eval/bin @mkdir -p eval/bin
@$(GO) build $(GOFLAGS) $(LDFLAGS) -o eval/bin/eval-runner ./eval/cmd/eval-runner @$(EVAL_GO) build $(GOFLAGS) $(LDFLAGS) -o eval/bin/eval-runner ./eval/cmd/eval-runner
@echo "Eval runner built: eval/bin/eval-runner" @echo "Eval runner built: eval/bin/eval-runner"
## eval: Run the eval suite against the current build ## eval: Run the eval suite against the current build
eval: eval-build eval-fixtures eval: eval-build eval-fixtures
@echo "Running eval suite..." @echo "Running eval suite..."
@cd eval && DRAGONSCALE_EVAL_CONFIG="./configs/default.json" npx promptfoo eval --config promptfooconfig.yaml --no-cache --no-progress-bar @$(EVAL_BASH) 'cd eval && DRAGONSCALE_EVAL_CONFIG="./configs/default.json" $(EVAL_NPM) promptfoo eval --config promptfooconfig.yaml --no-cache --no-progress-bar'
@echo "Results: eval/results/latest.json" @echo "Results: eval/results/latest.json"
@echo "View: cd eval && npx promptfoo view" @echo "View: cd eval && $(EVAL_NPM) promptfoo view"
## eval-fixtures: Reset workspace to a known state and seed fixture files for eval ## eval-fixtures: Reset workspace to a known state and seed fixture files for eval
## Uses XDG paths: ~/.local/share/dragonscale/sandbox/ and ~/.local/share/dragonscale/skills/ ## Uses XDG paths: ~/.local/share/dragonscale/sandbox/ and ~/.local/share/dragonscale/skills/
eval-fixtures: eval-fixtures:
@mkdir -p $(HOME)/.local/share/dragonscale/sandbox @$(EVAL_BASH) '\
@rm -f $(HOME)/.local/share/dragonscale/sandbox/eval_test_output.txt \ mkdir -p "$$HOME/.local/share/dragonscale/sandbox"; \
$(HOME)/.local/share/dragonscale/sandbox/test_steps.txt \ rm -f "$$HOME/.local/share/dragonscale/sandbox/eval_test_output.txt" \
$(HOME)/.local/share/dragonscale/sandbox/eval_checkpoint.txt \ "$$HOME/.local/share/dragonscale/sandbox/test_steps.txt" \
$(HOME)/.local/share/dragonscale/sandbox/chain_test.txt \ "$$HOME/.local/share/dragonscale/sandbox/eval_checkpoint.txt" \
$(HOME)/.local/share/dragonscale/sandbox/current_year.txt \ "$$HOME/.local/share/dragonscale/sandbox/chain_test.txt" \
$(HOME)/.local/share/dragonscale/sandbox/result.txt \ "$$HOME/.local/share/dragonscale/sandbox/current_year.txt" \
$(HOME)/.local/share/dragonscale/sandbox/progressive_test.txt \ "$$HOME/.local/share/dragonscale/sandbox/result.txt" \
$(HOME)/.local/share/dragonscale/sandbox/os_name.txt "$$HOME/.local/share/dragonscale/sandbox/progressive_test.txt" \
@rm -rf $(HOME)/.local/share/dragonscale/sandbox/project "$$HOME/.local/share/dragonscale/sandbox/os_name.txt"; \
@printf 'dragonscale eval fixture — hello from the eval harness\nThis is line two of the fixture file.\n' > $(HOME)/.local/share/dragonscale/sandbox/eval_fixture.txt rm -rf "$$HOME/.local/share/dragonscale/sandbox/project"; \
@cp -f eval/fixtures/sample_data.txt $(HOME)/.local/share/dragonscale/sandbox/sample_data.txt printf '"'"'dragonscale eval fixture — hello from the eval harness\nThis is line two of the fixture file.\n'"'"' > "$$HOME/.local/share/dragonscale/sandbox/eval_fixture.txt"; \
@mkdir -p $(HOME)/.local/share/dragonscale/skills cp -f eval/fixtures/sample_data.txt "$$HOME/.local/share/dragonscale/sandbox/sample_data.txt"; \
@cp -rf eval/fixtures/skills/* $(HOME)/.local/share/dragonscale/skills/ 2>/dev/null || true mkdir -p "$$HOME/.local/share/dragonscale/skills"; \
cp -rf eval/fixtures/skills/* "$$HOME/.local/share/dragonscale/skills/" 2>/dev/null || true'
## eval-view: Open the promptfoo results viewer ## eval-view: Open the promptfoo results viewer
eval-view: eval-view:
@cd eval && npx promptfoo view @$(EVAL_BASH) 'cd eval && $(EVAL_NPM) promptfoo view'
eval-clean: eval-clean:
@rm -rf eval/results @rm -rf eval/results
@ -309,12 +324,12 @@ eval-clean:
## eval-compare: A/B comparison of current branch vs main ## eval-compare: A/B comparison of current branch vs main
eval-compare: eval-compare:
@./eval/scripts/compare.sh --repeat 3 @$(EVAL_BASH) 'cd eval && EVAL_NPM_CMD=$(EVAL_NPM) ./scripts/compare.sh --repeat 3'
## eval-test: Run Go-native component evals ## eval-test: Run Go-native component evals
eval-test: eval-test:
@echo "Running Go-native evals..." @echo "Running Go-native evals..."
@$(GO) test -v ./eval/go_evals/... @$(EVAL_GO) test -v ./eval/go_evals/...
## help: Show this help message ## help: Show this help message
help: help:
@ -333,6 +348,7 @@ help:
@echo " make install-skills # Install skills to workspace" @echo " make install-skills # Install skills to workspace"
@echo "" @echo ""
@echo "Environment Variables:" @echo "Environment Variables:"
@echo " DEVCONTAINER_EXEC # Override to force host or custom container command (set empty to disable)"
@echo " INSTALL_PREFIX # Installation prefix (default: ~/.local)" @echo " INSTALL_PREFIX # Installation prefix (default: ~/.local)"
@echo " WORKSPACE_DIR # Workspace directory (default: ~/.dragonscale/workspace)" @echo " WORKSPACE_DIR # Workspace directory (default: ~/.dragonscale/workspace)"
@echo " VERSION # Version string (default: git describe)" @echo " VERSION # Version string (default: git describe)"

6
eval/README.md
View file

@ -10,7 +10,13 @@ npm install -g promptfoo
# Build eval runner and run suite # Build eval runner and run suite
make eval make eval
```
`make eval`, `make eval-test`, `make eval-compare`, and `make eval-fixtures` run inside the devcontainer when `npx` is available, keeping command execution aligned with the container build environment.
Set `DEVCONTAINER_EXEC=` to force host execution for these targets.
```bash
# View results in browser # View results in browser
make eval-view make eval-view

9
eval/scripts/compare.sh
View file

@ -8,6 +8,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
EVAL_DIR="$(dirname "$SCRIPT_DIR")" EVAL_DIR="$(dirname "$SCRIPT_DIR")"
PROJECT_ROOT="$(dirname "$EVAL_DIR")" PROJECT_ROOT="$(dirname "$EVAL_DIR")"
REPEAT=${1:-3} REPEAT=${1:-3}
NPM_CMD="${EVAL_NPM_CMD:-npx}"
if [[ "${1:-}" == "--repeat" ]]; then if [[ "${1:-}" == "--repeat" ]]; then
REPEAT="${2:-3}" REPEAT="${2:-3}"
@ -54,10 +55,14 @@ providers:
label: "branch" label: "branch"
config: config:
timeout: 120000 timeout: 120000
env:
DRAGONSCALE_EVAL_CONFIG: "./configs/default.json"
- id: "exec:./bin/eval-runner-main" - id: "exec:./bin/eval-runner-main"
label: "main" label: "main"
config: config:
timeout: 120000 timeout: 120000
env:
DRAGONSCALE_EVAL_CONFIG: "./configs/default.json"
defaultTest: defaultTest:
assert: assert:
@ -84,9 +89,9 @@ YAML
# 4. Run comparison # 4. Run comparison
echo "[3/4] Running eval comparison (${REPEAT}x)..." echo "[3/4] Running eval comparison (${REPEAT}x)..."
npx promptfoo eval -c promptfooconfig-compare.yaml --repeat "$REPEAT" --no-progress-bar "${NPM_CMD}" promptfoo eval -c promptfooconfig-compare.yaml --repeat "$REPEAT" --no-progress-bar
echo "" echo ""
echo "[4/4] Results saved to eval/results/comparison.json" echo "[4/4] Results saved to eval/results/comparison.json"
echo "" echo ""
echo "View results: cd eval && npx promptfoo view" echo "View results: cd eval && ${NPM_CMD} promptfoo view"