cg33andClaude
66f3007f07
* feat(agent): add ACP stdio JSON-RPC adapter (MVP) Implement agent/acp as an ACP client over newline-delimited JSON-RPC: initialize, session/new or session/load, session/prompt, session/update mapping to core.Event, and session/request_permission wired to RespondPermission. Includes plugin_agent_acp.go (!no_acp), Makefile ALL_AGENTS entry, config example, unit tests for transport and mapping, and AgentDoctorInfo for doctor. Made-with: Cursor * fix(acp): Cursor CLI compatibility — authenticate + cursor/* RPC ack - Optional auth_method (e.g. cursor_login) triggers JSON-RPC authenticate after initialize - initialize includes minimal clientCapabilities (fs/terminal) per Cursor ACP docs - Acknowledge cursor/* server requests with empty result to avoid blocking tool flows - Add integration test against ~/.local/bin/agent when present - Document auth_method and args in config.example.toml * fix(telegram): use Request for sendChatAction typing indicator Telegram returns result=true for sendChatAction; BotAPI.Send unmarshals result as Message and fails. Request only checks ok and avoids that decode. * fix(core): surface EventToolResult in IM; extend ACP tool/thinking mapping - Engine: handle EventToolResult in interactive loop (was silently dropped); compress and relay paths append tool output too. Add MsgToolResult i18n. - ACP: stream tool_call_update for in_progress/pending; optional reasoning_* sessionUpdate kinds -> EventThinking; fallback hook for unknown kinds. * fix(core): run agent Send concurrently with interactive event loop Agents that block inside Send (e.g. ACP session/prompt) can emit EventPermissionRequest while blocked; the engine must consume Events() in parallel or permission prompts never reach the platform. - processInteractiveMessageWith: async Send + pass sendDone into processInteractiveEvents - processInteractiveEvents: select on sendDone for errors and sync at turn boundaries - drainPendingMessages: same async Send pattern as the main path - Add TestProcessInteractiveEvents_PermissionWhileSendBlocked regression test * docs(acp): document OpenClaw and Copilot CLI; add display_name option - config.example.toml: Cursor, OpenClaw (`openclaw acp`), Copilot (`copilot --acp --stdio`) examples with upstream doc links - acp agent: optional display_name for doctor (AgentDoctorInfo) - agent_test.go: cover default and custom display_name * fix(core): remove ineffectual pendingSend assignments (ineffassign) pendingSend was set to nil immediately before return or before reassignment to nextSend; golangci-lint flags these as ineffectual. * test(core): fix race in PermissionWhileSendBlocked under -race The test goroutine polled stubInlineButtonPlatform.buttonRows while processInteractiveEvents wrote them from another goroutine. Use a permSignalInlinePlatform wrapper that signals on perm:allow via a channel instead of racy field reads. --------- Co-authored-by: Claude <noreply@anthropic.com>
163 lines
5.0 KiB
Makefile
163 lines
5.0 KiB
Makefile
APP := cc-connect
|
|
MODULE := github.com/chenhg5/cc-connect
|
|
CMD := ./cmd/cc-connect
|
|
DIST := dist
|
|
|
|
VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
|
|
COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null || echo "none")
|
|
BUILD_TIME := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
|
|
|
|
LDFLAGS := -s -w \
|
|
-X main.version=$(VERSION) \
|
|
-X main.commit=$(COMMIT) \
|
|
-X main.buildTime=$(BUILD_TIME)
|
|
|
|
PLATFORMS := \
|
|
linux/amd64 \
|
|
linux/arm64 \
|
|
darwin/amd64 \
|
|
darwin/arm64 \
|
|
windows/amd64 \
|
|
windows/arm64
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Selective compilation via build tags.
|
|
#
|
|
# By default all agents and platforms are included. To build with only
|
|
# specific ones, set AGENTS and/or PLATFORMS_INCLUDE:
|
|
#
|
|
# make build AGENTS=claudecode PLATFORMS_INCLUDE=feishu,telegram
|
|
#
|
|
# You can also exclude specific ones:
|
|
#
|
|
# make build EXCLUDE=discord,dingtalk,qq,qqbot,line
|
|
# ---------------------------------------------------------------------------
|
|
|
|
ALL_AGENTS := acp claudecode codex cursor gemini iflow opencode pi qoder
|
|
ALL_PLATFORMS := feishu telegram discord slack dingtalk wecom weixin qq qqbot line
|
|
|
|
COMMA := ,
|
|
|
|
# Compute exclusion tags from AGENTS / PLATFORMS_INCLUDE / EXCLUDE variables
|
|
_EXCLUDE_TAGS :=
|
|
|
|
ifdef AGENTS
|
|
_WANTED_AGENTS := $(subst $(COMMA), ,$(AGENTS))
|
|
_EXCLUDE_AGENTS := $(filter-out $(_WANTED_AGENTS),$(ALL_AGENTS))
|
|
_EXCLUDE_TAGS += $(addprefix no_,$(_EXCLUDE_AGENTS))
|
|
endif
|
|
|
|
ifdef PLATFORMS_INCLUDE
|
|
_WANTED_PLATFORMS := $(subst $(COMMA), ,$(PLATFORMS_INCLUDE))
|
|
_EXCLUDE_PLATFORMS := $(filter-out $(_WANTED_PLATFORMS),$(ALL_PLATFORMS))
|
|
_EXCLUDE_TAGS += $(addprefix no_,$(_EXCLUDE_PLATFORMS))
|
|
endif
|
|
|
|
ifdef EXCLUDE
|
|
_EXCLUDE_TAGS += $(addprefix no_,$(subst $(COMMA), ,$(EXCLUDE)))
|
|
endif
|
|
|
|
_BUILD_TAGS := $(strip $(_EXCLUDE_TAGS))
|
|
_TAGS_FLAG := $(if $(_BUILD_TAGS),-tags '$(_BUILD_TAGS)',)
|
|
|
|
.PHONY: build run clean test test-fast test-full test-smoke test-e2e test-release test-performance pre-test lint release release-all
|
|
|
|
build:
|
|
go build $(_TAGS_FLAG) -ldflags "$(LDFLAGS)" -o $(APP) $(CMD)
|
|
|
|
run: build
|
|
./$(APP)
|
|
|
|
clean:
|
|
rm -f $(APP)
|
|
rm -rf $(DIST)
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Testing targets.
|
|
#
|
|
# test-fast: Unit tests + smoke tests (< 2 min). Runs on every push.
|
|
# test-full: Full test suite including regression (< 10 min). PR requirement.
|
|
# test-smoke: Smoke tests only (< 1 min). Quick sanity check.
|
|
# test-e2e: E2E and regression tests only.
|
|
# test-release: Full + performance benchmarks. Before release.
|
|
# pre-test: Prerequisites (build + vet) before running tests.
|
|
# ---------------------------------------------------------------------------
|
|
|
|
pre-test:
|
|
go build ./...
|
|
go vet ./...
|
|
|
|
# Fast test: unit tests + smoke tests
|
|
test-fast: pre-test
|
|
go test -parallel=4 -race ./...
|
|
go test -parallel=4 -tags=smoke ./tests/e2e/...
|
|
|
|
# Full test: unit + smoke + regression (PR requirement)
|
|
test-full: pre-test
|
|
go test -parallel=4 -race ./...
|
|
go test -parallel=4 -tags=smoke ./tests/e2e/...
|
|
go test -parallel=2 -tags=regression ./tests/e2e/...
|
|
|
|
# Smoke tests only
|
|
test-smoke: pre-test
|
|
go test -v -tags=smoke ./tests/e2e/...
|
|
|
|
# E2E/regression tests only
|
|
test-e2e: pre-test
|
|
go test -v -tags=regression ./tests/e2e/...
|
|
|
|
# Performance benchmarks only
|
|
test-performance: pre-test
|
|
go test -bench=. -benchmem -tags=performance ./tests/performance/...
|
|
|
|
# Release test: full + performance benchmarks
|
|
test-release: pre-test
|
|
go test -parallel=4 -race ./...
|
|
go test -parallel=4 -tags=smoke ./tests/e2e/...
|
|
go test -parallel=2 -tags=regression ./tests/e2e/...
|
|
go test -bench=. -benchmem -tags=performance ./tests/performance/...
|
|
|
|
# Legacy: runs unit tests only
|
|
test:
|
|
go test -v ./...
|
|
|
|
lint:
|
|
golangci-lint run ./...
|
|
|
|
release-all: clean
|
|
@mkdir -p $(DIST)
|
|
@$(foreach platform,$(PLATFORMS), \
|
|
$(eval GOOS := $(word 1,$(subst /, ,$(platform)))) \
|
|
$(eval GOARCH := $(word 2,$(subst /, ,$(platform)))) \
|
|
$(eval EXT := $(if $(filter windows,$(GOOS)),.exe,)) \
|
|
$(eval OUT := $(DIST)/$(APP)-$(VERSION)-$(GOOS)-$(GOARCH)$(EXT)) \
|
|
echo "Building $(OUT)" && \
|
|
GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 \
|
|
go build $(_TAGS_FLAG) -ldflags "$(LDFLAGS)" -o $(OUT) $(CMD) && \
|
|
) true
|
|
@echo "Packaging archives..."
|
|
@cd $(DIST) && for f in $(APP)-*; do \
|
|
case "$$f" in \
|
|
*.tar.gz|*.zip) continue ;; \
|
|
*.exe) zip "$${f%.exe}.zip" "$$f" ;; \
|
|
*) tar czf "$$f.tar.gz" "$$f" ;; \
|
|
esac; \
|
|
done
|
|
@cd $(DIST) && sha256sum * > checksums.txt
|
|
@echo "Done. Binaries and archives in $(DIST)/"
|
|
|
|
release:
|
|
@if [ -z "$(TARGET)" ]; then \
|
|
echo "Usage: make release TARGET=linux/amd64"; \
|
|
echo "Available: $(PLATFORMS)"; \
|
|
exit 1; \
|
|
fi
|
|
@mkdir -p $(DIST)
|
|
$(eval GOOS := $(word 1,$(subst /, ,$(TARGET))))
|
|
$(eval GOARCH := $(word 2,$(subst /, ,$(TARGET))))
|
|
$(eval EXT := $(if $(filter windows,$(GOOS)),.exe,))
|
|
$(eval OUT := $(DIST)/$(APP)-$(VERSION)-$(GOOS)-$(GOARCH)$(EXT))
|
|
GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 \
|
|
go build $(_TAGS_FLAG) -ldflags "$(LDFLAGS)" -o $(OUT) $(CMD)
|
|
@echo "Built: $(OUT)"
|