Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ jobs:
with:
go-version: "1.25"
cache: true
- uses: golangci/golangci-lint-action@v6
- uses: golangci/golangci-lint-action@v8
with:
version: v1.61.0
version: v2.12.2
args: --timeout=5m

test:
Expand Down
142 changes: 80 additions & 62 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,80 +1,98 @@
# golangci-lint configuration for Joblantern
# https://golangci-lint.run/usage/configuration/

version: "2"
run:
timeout: 5m
tests: true
build-tags:
- integration

tests: true
output:
formats:
- format: colored-line-number
sort-results: true

text:
path: stdout
linters:
disable-all: true
default: none
enable:
- errcheck
- gofmt
- goimports
- gosec
- govet
- ineffassign
- revive
- staticcheck
- unused

linters-settings:
gofmt:
simplify: true
goimports:
local-prefixes: github.com/yasserrmd/joblantern
govet:
enable-all: true
disable:
- fieldalignment
revive:
severity: warning
settings:
gosec:
excludes:
- G104 # covered by errcheck
- G101 # DSN default string flag, not a real credential
- G118 # detached context in fire-and-forget verification goroutine is intentional
- G404 # non-crypto sampling/jitter, not security-sensitive
- G705 # output goes through html/template, which auto-escapes
- G124 # locale cookie carries no secrets; Secure would break the plain-HTTP .onion surface
govet:
disable:
- fieldalignment
- shadow # noisy, not part of govet's default set
enable-all: true
revive:
severity: warning
rules:
- name: blank-imports
- name: context-as-argument
- name: context-keys-type
- name: dot-imports
- name: error-return
- name: error-strings
- name: error-naming
- name: exported
- name: if-return
- name: increment-decrement
- name: var-naming
- name: var-declaration
- name: package-comments
- name: range
- name: receiver-naming
- name: time-naming
- name: unexported-return
- name: indent-error-flow
- name: errorf
- name: empty-block
- name: superfluous-else
- name: unused-parameter
- name: unreachable-code
exclusions:
generated: lax
presets:
- comments
- common-false-positives
- legacy
- std-error-handling
rules:
- name: blank-imports
- name: context-as-argument
- name: context-keys-type
- name: dot-imports
- name: error-return
- name: error-strings
- name: error-naming
- name: exported
- name: if-return
- name: increment-decrement
- name: var-naming
- name: var-declaration
- name: package-comments
- name: range
- name: receiver-naming
- name: time-naming
- name: unexported-return
- name: indent-error-flow
- name: errorf
- name: empty-block
- name: superfluous-else
- name: unused-parameter
- name: unreachable-code
- name: redefines-builtin-id
gosec:
excludes:
# G104 is covered by errcheck
- G104

- linters:
- errcheck
- gosec
path: _test\.go
- linters:
- revive
path: cmd/
text: package-comments
paths:
- third_party$
- builtin$
- examples$
issues:
exclude-rules:
- path: _test\.go
linters:
- gosec
- errcheck
- path: cmd/
linters:
- revive
text: "package-comments"
max-issues-per-linter: 0
max-same-issues: 0
formatters:
enable:
- gofmt
- goimports
settings:
gofmt:
simplify: true
goimports:
local-prefixes:
- github.com/yasserrmd/joblantern
exclusions:
generated: lax
paths:
- third_party$
- builtin$
- examples$
6 changes: 3 additions & 3 deletions cmd/joblantern/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func buildBuiltinSubagents() ([]agent.Subagent, error) {
return []agent.Subagent{
&agent.MCPSubagent{
NameStr: "pattern",
Run_: func(_ context.Context, sub agent.Submission) []agent.Fact {
RunFn: func(_ context.Context, sub agent.Submission) []agent.Fact {
if sub.ListingText == "" {
return nil
}
Expand All @@ -202,7 +202,7 @@ func buildBuiltinSubagents() ([]agent.Subagent, error) {
},
&agent.MCPSubagent{
NameStr: "language",
Run_: func(_ context.Context, sub agent.Submission) []agent.Fact {
RunFn: func(_ context.Context, sub agent.Submission) []agent.Fact {
if sub.ListingText == "" || sub.Jurisdiction == "" {
return nil
}
Expand Down Expand Up @@ -231,7 +231,7 @@ func buildAddressSubagent() agent.Subagent {
url := os.Getenv("MCP_ADDRESS_URL")
return &agent.MCPSubagent{
NameStr: "address",
Run_: func(ctx context.Context, sub agent.Submission) []agent.Fact {
RunFn: func(ctx context.Context, sub agent.Submission) []agent.Fact {
if url == "" || sub.ClaimedAddress == "" {
return nil
}
Expand Down
11 changes: 9 additions & 2 deletions cmd/mcp-accreditation/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,19 @@ var known = []Registry{
{ID: "in-ugc", Country: "IN", Name: "University Grants Commission", BaseURL: "https://www.ugc.gov.in"},
}

// canonical normalises an institution name for fuzzy matching.
// canonical normalises an institution name for fuzzy matching against
// registry entries.
func canonical(s string) string {
return strings.ToLower(strings.Join(strings.Fields(s), " "))
}

func main() {
slog.New(slog.NewJSONHandler(os.Stderr, nil)).Info("mcp-accreditation starting", "registries", len(known))
log := slog.New(slog.NewJSONHandler(os.Stderr, nil))
// Pre-canonicalise registry names so lookups are O(1) once tools land.
index := make(map[string]Registry, len(known))
for _, r := range known {
index[canonical(r.Name)] = r
}
log.Info("mcp-accreditation starting", "registries", len(index))
// MCP server boilerplate follows the established pattern.
}
2 changes: 1 addition & 1 deletion cmd/mcp-address/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-companies-house-uk/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-domain/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-eu-vies/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-hello/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func runStdio() error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-law/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-pattern/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-registry/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
10 changes: 9 additions & 1 deletion cmd/mcp-rental-listings/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,15 @@ func validateURL(raw string) (string, error) {

func main() {
logger := slog.New(slog.NewJSONHandler(os.Stderr, nil))
logger.Info("mcp-rental-listings starting")
logger.Info("mcp-rental-listings starting", "result_type", fmt.Sprintf("%T", listing{}))
// Validate the configured aggregator base URL early so a
// misconfiguration fails fast at boot rather than at first call.
if base := os.Getenv("RENTAL_AGGREGATOR_URL"); base != "" {
if _, err := validateURL(base); err != nil {
logger.Error("invalid RENTAL_AGGREGATOR_URL", "err", err)
os.Exit(1)
}
}
// The MCP server boilerplate (stdio, tool registration) follows
// the same template as the other Joblantern MCP servers and is
// wired in a subsequent commit alongside the rental rule pack.
Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-routing/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-salary/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-scam-db/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mcp-streetview/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func runStdio(s *mcp.Server) error {
if err != nil {
return err
}
session.Wait()
_ = session.Wait()
return nil
}

Expand Down
8 changes: 4 additions & 4 deletions internal/agent/subagents.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ type ClientFn func(ctx context.Context, server string) (*mcpclient.Client, error
// wired in the binary's main.go and share this struct.
type MCPSubagent struct {
NameStr string
Run_ func(ctx context.Context, sub Submission) []Fact
RunFn func(ctx context.Context, sub Submission) []Fact
}

func (m *MCPSubagent) Name() string { return m.NameStr }
func (m *MCPSubagent) Run(ctx context.Context, sub Submission) []Fact { return m.Run_(ctx, sub) }
func (m *MCPSubagent) Run(ctx context.Context, sub Submission) []Fact { return m.RunFn(ctx, sub) }

// runParallel is a convenience helper sub-agents use to call multiple
// RunParallel is a convenience helper sub-agents use to call multiple
// MCP tools concurrently and append their results.
func runParallel(funcs ...func() []Fact) []Fact {
func RunParallel(funcs ...func() []Fact) []Fact {
var (
mu sync.Mutex
out []Fact
Expand Down
Loading
Loading