Merge pull request #11 from stgraber/main

stgraber · web-flow · commit 25ad5a4036ec · 2026-05-03T01:17:22.000-04:00
Add source field for flag submissions
diff --git a/Dockerfile b/Dockerfile
@@ -2,8 +2,9 @@ FROM golang:latest AS builder
 WORKDIR /src
 COPY go.mod go.sum ./
 RUN go mod download
+RUN apt-get update && apt-get install -y make
 COPY . .
-RUN apt-get update && apt-get install -y make && make linux
+RUN make linux
 
 FROM debian:bookworm-slim
 COPY --from=builder /src/bin/linux/askgod-server /askgod-server
diff --git a/README.md b/README.md
@@ -47,4 +47,10 @@ This will create two executables in `./bin/linux`: `askgod` and `askgod-server`.
 
 ```bash
 ./bin/linux/askgod-server ./askgod.yaml.example
-```
+```
+
+## MCP Server
+
+The askgod server supports an MCP server at `<askgod_server_address>/mcp`.
+This MCP server allows users to submit flags.
+The MCP Server is disabled by default, but can be enabled by setting `mcp: true` in the config.
diff --git a/api/config.go b/api/config.go
@@ -9,6 +9,7 @@ type Config struct {
 
 	Daemon   ConfigDaemon   `json:"daemon"   yaml:"daemon"`
 	Database ConfigDatabase `json:"database" yaml:"database"`
+	MCP      bool           `json:"mcp"      yaml:"mcp"`
 }
 
 // ConfigPut represents the editable Askgod configuration.
diff --git a/api/flag.go b/api/flag.go
@@ -1,9 +1,47 @@
 package api
 
 import (
+	"slices"
 	"time"
 )
 
+// Valid values for the Source field on flag and score entries.
+const (
+	SourceUnknown  = "unknown"
+	SourceCLI      = "cli"
+	SourceCLIAgent = "cli+agent"
+	SourceMCP      = "mcp"
+	SourceWeb      = "web"
+	SourceWebAgent = "web+agent"
+)
+
+// validSources lists every accepted Source value (excluding the empty string,
+// which is normalized to SourceUnknown by NormalizeSource).
+var validSources = []string{
+	SourceUnknown,
+	SourceCLI,
+	SourceCLIAgent,
+	SourceMCP,
+	SourceWeb,
+	SourceWebAgent,
+}
+
+// NormalizeSource validates the provided source and returns the canonical
+// value to store. An empty source is translated to SourceUnknown for
+// compatibility with older clients. The returned bool indicates whether the
+// input was a recognized value.
+func NormalizeSource(source string) (string, bool) {
+	if source == "" {
+		return SourceUnknown, true
+	}
+
+	if slices.Contains(validSources, source) {
+		return source, true
+	}
+
+	return source, false
+}
+
 // URL: /1.0/team/flags
 // Access: team
 
@@ -15,6 +53,7 @@ type Flag struct {
 	Description  string    `json:"description"   yaml:"description"`
 	ReturnString string    `json:"return_string" yaml:"return_string"`
 	Value        int64     `json:"value"         yaml:"value"`
+	Source       string    `json:"source"        yaml:"source"`
 	SubmitTime   time.Time `json:"submit_time"   yaml:"submit_time"`
 }
 
@@ -24,10 +63,19 @@ type FlagPut struct {
 }
 
 // FlagPost represents the fields used to submit a new score entry.
+//
+// Source tracks where the flag submission came from. Valid values are:
+//   - ""           => compatibility mechanism, translated to "unknown" internally
+//   - "cli"        => human submission through CLI
+//   - "cli+agent"  => agent submission through CLI
+//   - "mcp"        => submitted through the MCP server
+//   - "web"        => human submission through website
+//   - "web+agent"  => agent submission through website
 type FlagPost struct {
 	FlagPut `yaml:",inline"`
 
-	Flag string `json:"flag" yaml:"flag"`
+	Flag   string `json:"flag"   yaml:"flag"`
+	Source string `json:"source" yaml:"source"`
 }
 
 // URL: /1.0/flags
diff --git a/api/score.go b/api/score.go
@@ -25,6 +25,7 @@ type AdminScorePut struct {
 type AdminScorePost struct {
 	AdminScorePut `yaml:",inline"`
 
-	TeamID int64 `json:"team_id" yaml:"team_id"`
-	FlagID int64 `json:"flag_id" yaml:"flag_id"`
+	TeamID int64  `json:"team_id" yaml:"team_id"`
+	FlagID int64  `json:"flag_id" yaml:"flag_id"`
+	Source string `json:"source"  yaml:"source"`
 }
diff --git a/askgod.yaml.example b/askgod.yaml.example
@@ -95,3 +95,6 @@ subnets:
   guests:
     - ::/0
     - 0.0.0.0/0
+
+# Enable or disable the MCP server. Defaults to false.
+mcp: true
diff --git a/cmd/askgod/cmd_admin_score.go b/cmd/askgod/cmd_admin_score.go
@@ -110,7 +110,7 @@ func (c *client) cmdAdminListScores(ctx context.Context, _ *cli.Command) error {
 	const layout = "2006/01/02 15:04"
 
 	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader([]string{"ID", "TeamID", "FlagID", "Value", "Submit time", "Notes"})
+	table.SetHeader([]string{"ID", "TeamID", "FlagID", "Value", "Submit time", "Source", "Notes"})
 	table.SetBorder(false)
 	table.SetAutoWrapText(false)
 
@@ -121,6 +121,7 @@ func (c *client) cmdAdminListScores(ctx context.Context, _ *cli.Command) error {
 			strconv.FormatInt(entry.FlagID, 10),
 			strconv.FormatInt(entry.Value, 10),
 			entry.SubmitTime.Local().Format(layout),
+			entry.Source,
 			entry.Notes,
 		})
 	}
diff --git a/cmd/askgod/cmd_history.go b/cmd/askgod/cmd_history.go
@@ -50,7 +50,7 @@ func (c *client) cmdHistory(ctx context.Context, cmd *cli.Command) error {
 	const layout = "2006/01/02 15:04"
 
 	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader([]string{"ID", "Description", "Value", "Timestamp", "Message", "Notes"})
+	table.SetHeader([]string{"ID", "Description", "Value", "Timestamp", "Source", "Message", "Notes"})
 	table.SetBorder(false)
 	table.SetAutoWrapText(false)
 
@@ -60,6 +60,7 @@ func (c *client) cmdHistory(ctx context.Context, cmd *cli.Command) error {
 			flag.Description,
 			strconv.FormatInt(flag.Value, 10),
 			flag.SubmitTime.Local().Format(layout),
+			flag.Source,
 			flag.ReturnString,
 			flag.Notes,
 		})
diff --git a/cmd/askgod/cmd_submit.go b/cmd/askgod/cmd_submit.go
@@ -3,12 +3,34 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/urfave/cli/v3"
 
 	"github.com/nsec/askgod/api"
 )
 
+func hasAgentInEnvVariable() bool {
+	for _, env := range []string{
+		"AGENT",
+		"ANTIGRAVITY_AGENT",
+		"CLAUDECODE",
+		"CLAUDE_CODE_IS_COWORK",
+		"CLINE_ACTIVE",
+		"CODEX_SHELL",
+		"CURSOR_AGENT",
+		"GEMINI_CLI",
+		"OPENCODE",
+		"WINDSURF_CASCADE_TERMINAL_KIND",
+	} {
+		if os.Getenv(env) != "" {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (c *client) cmdSubmit(ctx context.Context, cmd *cli.Command) error {
 	if cmd.NArg() != 1 {
 		_ = cli.ShowCommandHelp(ctx, cmd, "submit")
@@ -21,6 +43,22 @@ func (c *client) cmdSubmit(ctx context.Context, cmd *cli.Command) error {
 	flag.Flag = cmd.Args().Get(0)
 	flag.Notes = cmd.String("notes")
 
+	// Determine whether the submission was AI-assisted using a tri-state flag:
+	// --agent forces on, --agent=false forces off, otherwise autodetect from env.
+	var agent bool
+	if cmd.IsSet("agent") {
+		agent = cmd.Bool("agent")
+	} else {
+		agent = hasAgentInEnvVariable()
+	}
+
+	flag.Source = api.SourceCLI
+	if agent {
+		flag.Source = api.SourceCLIAgent
+
+		_, _ = fmt.Print("Note: This flag submission is marked as AI-assisted.\n") //nolint:forbidigo
+	}
+
 	// Send the flag
 	resp := api.Flag{}
 
diff --git a/cmd/askgod/main.go b/cmd/askgod/main.go
@@ -231,6 +231,10 @@ func main() {
 					Name:  "notes",
 					Usage: "Some notes to remind you of the flag",
 				},
+				&cli.BoolFlag{
+					Name:  "agent",
+					Usage: "Override AI agent autodetection (--agent to force on, --agent=false to force off)",
+				},
 			},
 			Action: c.cmdSubmit,
 		},
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,6 +21,7 @@ services:
     volumes:
       - ${PWD}/askgod.yaml:/askgod.yaml
     command: /askgod.yaml
+    restart: on-failure
     depends_on:
       - database
 
diff --git a/internal/database/db_scores.go b/internal/database/db_scores.go
@@ -30,7 +30,7 @@ func (db *DB) GetTeamFlags(ctx context.Context, teamid int64) ([]api.Flag, error
 	resp := []api.Flag{}
 
 	// Query all the scores from the database
-	rows, err := db.QueryContext(ctx, "SELECT score.flagid, flag.description, score.value, score.notes, score.submit_time, flag.return_string FROM score LEFT JOIN flag ON flag.id=score.flagid WHERE score.teamid=$1 ORDER BY score.submit_time ASC;", teamid)
+	rows, err := db.QueryContext(ctx, "SELECT score.flagid, flag.description, score.value, score.notes, score.source, score.submit_time, flag.return_string FROM score LEFT JOIN flag ON flag.id=score.flagid WHERE score.teamid=$1 ORDER BY score.submit_time ASC;", teamid)
 	if err != nil {
 		return nil, err
 	}
@@ -40,7 +40,7 @@ func (db *DB) GetTeamFlags(ctx context.Context, teamid int64) ([]api.Flag, error
 	for rows.Next() {
 		row := api.Flag{}
 
-		err := rows.Scan(&row.ID, &row.Description, &row.Value, &row.Notes, &row.SubmitTime, &row.ReturnString)
+		err := rows.Scan(&row.ID, &row.Description, &row.Value, &row.Notes, &row.Source, &row.SubmitTime, &row.ReturnString)
 		if err != nil {
 			return nil, err
 		}
@@ -63,8 +63,8 @@ func (db *DB) GetTeamFlag(ctx context.Context, teamid int64, id int64) (*api.Fla
 	resp := api.Flag{}
 
 	// Query all the scores from the database
-	err := db.QueryRowContext(ctx, "SELECT score.flagid, flag.description, score.value, score.notes, score.submit_time, flag.return_string FROM score LEFT JOIN flag ON flag.id=score.flagid WHERE score.teamid=$1 AND score.flagid=$2 ORDER BY score.submit_time ASC;", teamid, id).Scan(
-		&resp.ID, &resp.Description, &resp.Value, &resp.Notes, &resp.SubmitTime, &resp.ReturnString)
+	err := db.QueryRowContext(ctx, "SELECT score.flagid, flag.description, score.value, score.notes, score.source, score.submit_time, flag.return_string FROM score LEFT JOIN flag ON flag.id=score.flagid WHERE score.teamid=$1 AND score.flagid=$2 ORDER BY score.submit_time ASC;", teamid, id).Scan(
+		&resp.ID, &resp.Description, &resp.Value, &resp.Notes, &resp.Source, &resp.SubmitTime, &resp.ReturnString)
 	if err != nil {
 		return nil, err
 	}
@@ -124,17 +124,17 @@ func (db *DB) SubmitTeamFlag(ctx context.Context, teamid int64, flag api.FlagPos
 	// Add the flag
 	id = -1
 
-	err = db.QueryRowContext(ctx, "INSERT INTO score (teamid, flagid, value, notes, submit_time) VALUES ($1, $2, $3, $4, $5) RETURNING id;",
-		teamid, row.ID, row.Value, flag.Notes, time.Now()).Scan(&id)
+	err = db.QueryRowContext(ctx, "INSERT INTO score (teamid, flagid, value, notes, submit_time, source) VALUES ($1, $2, $3, $4, $5, $6) RETURNING id;",
+		teamid, row.ID, row.Value, flag.Notes, time.Now(), flag.Source).Scan(&id)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	// Query the new entry
 	result := api.Flag{}
 
-	err = db.QueryRowContext(ctx, "SELECT score.flagid, flag.description, score.value, score.notes, score.submit_time, flag.return_string FROM score LEFT JOIN flag ON flag.id=score.flagid WHERE score.id=$1;", id).Scan(
-		&result.ID, &result.Description, &result.Value, &result.Notes, &result.SubmitTime, &result.ReturnString)
+	err = db.QueryRowContext(ctx, "SELECT score.flagid, flag.description, score.value, score.notes, score.source, score.submit_time, flag.return_string FROM score LEFT JOIN flag ON flag.id=score.flagid WHERE score.id=$1;", id).Scan(
+		&result.ID, &result.Description, &result.Value, &result.Notes, &result.Source, &result.SubmitTime, &result.ReturnString)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -148,7 +148,7 @@ func (db *DB) GetScores(ctx context.Context) ([]api.AdminScore, error) {
 	resp := []api.AdminScore{}
 
 	// Query all the scores from the database
-	rows, err := db.QueryContext(ctx, "SELECT id, teamid, flagid, value, notes, submit_time FROM score ORDER BY id ASC;")
+	rows, err := db.QueryContext(ctx, "SELECT id, teamid, flagid, value, notes, source, submit_time FROM score ORDER BY id ASC;")
 	if err != nil {
 		return nil, err
 	}
@@ -158,7 +158,7 @@ func (db *DB) GetScores(ctx context.Context) ([]api.AdminScore, error) {
 	for rows.Next() {
 		row := api.AdminScore{}
 
-		err := rows.Scan(&row.ID, &row.TeamID, &row.FlagID, &row.Value, &row.Notes, &row.SubmitTime)
+		err := rows.Scan(&row.ID, &row.TeamID, &row.FlagID, &row.Value, &row.Notes, &row.Source, &row.SubmitTime)
 		if err != nil {
 			return nil, err
 		}
@@ -180,8 +180,8 @@ func (db *DB) GetScore(ctx context.Context, id int64) (*api.AdminScore, error) {
 	// Query the database entry
 	row := api.AdminScore{}
 
-	err := db.QueryRowContext(ctx, "SELECT id, teamid, flagid, value, notes, submit_time FROM score WHERE id=$1;", id).Scan(
-		&row.ID, &row.TeamID, &row.FlagID, &row.Value, &row.Notes, &row.SubmitTime)
+	err := db.QueryRowContext(ctx, "SELECT id, teamid, flagid, value, notes, source, submit_time FROM score WHERE id=$1;", id).Scan(
+		&row.ID, &row.TeamID, &row.FlagID, &row.Value, &row.Notes, &row.Source, &row.SubmitTime)
 	if err != nil {
 		return nil, err
 	}
@@ -194,8 +194,8 @@ func (db *DB) CreateScore(ctx context.Context, score api.AdminScorePost) (int64,
 	id := int64(-1)
 
 	// Create the database entry
-	err := db.QueryRowContext(ctx, "INSERT INTO score (teamid, flagid, value, notes, submit_time) VALUES ($1, $2, $3, $4, $5) RETURNING id",
-		score.TeamID, score.FlagID, score.Value, score.Notes, time.Now()).Scan(&id)
+	err := db.QueryRowContext(ctx, "INSERT INTO score (teamid, flagid, value, notes, source, submit_time) VALUES ($1, $2, $3, $4, $5, $6) RETURNING id",
+		score.TeamID, score.FlagID, score.Value, score.Notes, score.Source, time.Now()).Scan(&id)
 	if err != nil {
 		return -1, err
 	}
diff --git a/internal/database/schema.go b/internal/database/schema.go
@@ -33,6 +33,7 @@ CREATE TABLE IF NOT EXISTS score (
     value INTEGER NOT NULL DEFAULT 0,
     submit_time TIMESTAMP WITH TIME ZONE,
     notes VARCHAR,
+    source VARCHAR NOT NULL DEFAULT 'unknown',
     FOREIGN KEY (teamid) REFERENCES team (id) ON DELETE CASCADE,
     FOREIGN KEY (flagid) REFERENCES flag (id) ON DELETE CASCADE,
     UNIQUE(teamid, flagid)
diff --git a/internal/database/updates.go b/internal/database/updates.go
@@ -10,6 +10,7 @@ import (
 var dbUpdates = []dbUpdate{
 	{version: 1, run: dbUpdateFromV0},
 	{version: 2, run: dbUpdateFromV1},
+	{version: 3, run: dbUpdateFromV2},
 }
 
 type dbUpdate struct {
@@ -51,3 +52,9 @@ CREATE TABLE IF NOT EXISTS config (
 
 	return err
 }
+
+func dbUpdateFromV2(ctx context.Context, _, _ int, db *DB) error {
+	_, err := db.ExecContext(ctx, "ALTER TABLE score ADD COLUMN source VARCHAR NOT NULL DEFAULT 'unknown';")
+
+	return err
+}
diff --git a/internal/mcp/mcp.go b/internal/mcp/mcp.go
diff --git a/internal/mcp/protocol.go b/internal/mcp/protocol.go
diff --git a/internal/mcp/tools.go b/internal/mcp/tools.go
diff --git a/internal/rest/api_flags.go b/internal/rest/api_flags.go
diff --git a/internal/rest/api_scores.go b/internal/rest/api_scores.go
diff --git a/internal/rest/attach.go b/internal/rest/attach.go
diff --git a/seed_data.sh b/seed_data.sh

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ type Config struct {`
`9`	`9`
`10`	`10`	Daemon ConfigDaemon `json:"daemon" yaml:"daemon"`
`11`	`11`	Database ConfigDatabase `json:"database" yaml:"database"`
	`12`	+ MCP bool `json:"mcp" yaml:"mcp"`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`// ConfigPut represents the editable Askgod configuration.`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ type AdminScorePut struct {`
`25`	`25`	`type AdminScorePost struct {`
`26`	`26`	AdminScorePut `yaml:",inline"`
`27`	`27`
`28`		- TeamID int64 `json:"team_id" yaml:"team_id"`
`29`		- FlagID int64 `json:"flag_id" yaml:"flag_id"`
	`28`	+ TeamID int64 `json:"team_id" yaml:"team_id"`
	`29`	+ FlagID int64 `json:"flag_id" yaml:"flag_id"`
	`30`	+ Source string `json:"source" yaml:"source"`
`30`	`31`	`}`