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
6 changes: 6 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ bin/qa/ stats.go (DuckDB quantiles / JSONL count; gcc CGO, not Zig)
bin/watch/ corpus watcher (used by bin/brain/watch.go)
bin/tools/ vendored python libs behind bin/* (kblib, yamlout, websearch)
bin/cgo/ zig zcc zc++ (CGO via zig cc, not gcc)
bin/stack/ start start-assistant stop status (compose + PicoClaw agent)
bin/docker-entrypoint container entrypoint (api: serve|search|watch; index: python)
compose.yaml docker composition (root level, not docker/)
Dockerfile api (Zig CGO, no Python) + index (Python write)
Expand Down Expand Up @@ -88,6 +89,7 @@ bin/facts/audit.go ["self"|"db"|"contradict"] # 2-source + D16 adjudication
bin/facts/crm.go [--dry-run] # proof person↔company/company↔project (ooCRM × corpus SoT)
bin/kb/search "query" [--repo X] # deprecated wrapper → bin/brain/search.go
bin/brain/search.go "query" [--root facts|info] # deduction search → YAML
bin/brain/search.go "query" --as-of 2025-01-01 # D24 fact intervals
bin/brain/search.go "query" --no-web # local graph only
source <(./bin/cli/complete.go bash) # flaggy completions (D23)
eval "$(bin/cgo/zig env)" # Zig cc + liblbug (not gcc)
Expand All @@ -98,6 +100,10 @@ bin/brain/get.go <id> [--body] [--json] # Go read; Python bin/kb/get CI
bin/brain/stats.go [--json]
bin/brain/eval.go [--json] # recall@5; questions in internal/brain/rank
bin/brain/serve.go # HTTP :8630; GET /openapi.json POST /mcp
bin/stack/start # brain HTTP/MCP (reuse healthy :8630)
bin/stack/start-assistant # + reasoner + PicoClaw agent
bin/stack/status # YAML health
bin/stack/stop # compose stop; volumes kept
bin/markdown/import.go [dir] # H2 leafs → YAML; Python bin/md/import fallback
bin/git/import.go [REPO] [--json] [--limit N] # go-git history → commit leafs
bin/web/search.go "query" [--json] # SearXNG; throttled ≠ absence
Expand Down
12 changes: 9 additions & 3 deletions PLAN.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ v2 board: milestone [v2](https://git.produktor.io/eSlider/2dph/milestone/13) —
OCR [#6](https://git.produktor.io/eSlider/2dph/issues/6) in,
[#29](https://git.produktor.io/eSlider/2dph/issues/29) OQ1 in,
[#30](https://git.produktor.io/eSlider/2dph/issues/30) OQ3 in,
[#34](https://git.produktor.io/eSlider/2dph/issues/34) D23 in.
[#34](https://git.produktor.io/eSlider/2dph/issues/34) D23 in,
[#36](https://git.produktor.io/eSlider/2dph/issues/36) OQ5/D24 in.
Gap: [docs/roadmap.md](docs/roadmap.md).

## What
Expand Down Expand Up @@ -53,6 +54,7 @@ detective method: **a fact needs ≥2 independent sources or it is
| D21 | CGO | Ladybug/tokenizers CGO is compiled with **Zig** (`bin/cgo/zcc` → `zig cc -target …-linux-gnu`), not gcc. `bin/cgo/zig` pins Zig 0.14.1 + liblbug 0.19.1 + libtokenizers 1.27.0. Compose `target: api` has no CPython; write/rebuild is profile `index`. |
| D22 | analytics | **duckdb-go** in-process (`internal/duckstats`, `bin/qa/stats.go`) for quantiles/JSONL. Links with **gcc/g++**, not Zig. Ladybug stays the graph; web-search cache stays modernc sqlite. Slice small structured docs with **mikefarah/yq**, not kislyuk/jq. [#30](https://git.produktor.io/eSlider/2dph/issues/30). |
| D23 | CLI | **flaggy** (`github.com/integrii/flaggy`, 0 deps). Flags at any position. Wrapper `internal/cli`. Bash complete: `source <(./bin/cli/complete.go bash)`. No cobra, no stdlib `flag` in Go tools. Search does not intercept the word `completion`. [#34](https://git.produktor.io/eSlider/2dph/issues/34). |
| D24 | fact intervals | Leaf `valid_from` / `valid_to` (YYYY-MM-DD, inclusive; empty = open/legacy). Search `--as-of` / MCP `as_of` keeps facts active that day. Not D16 `temporal_freshness` (source stale vs HEAD). Empty interval = always visible. [#36](https://git.produktor.io/eSlider/2dph/issues/36). |

## Architecture

Expand Down Expand Up @@ -83,7 +85,8 @@ detective method: **a fact needs ≥2 independent sources or it is
(libs in internal/chats; no chats index)
mail/ocr.go tesseract eng+deu (pdftoppm scans)
md/import (deprecated; bin/markdown/import.go)
brain/extract brain/audit brain/deduce (thinking wrapper)
brain/extract brain/audit brain/deduce (thinking wrapper)
stack/start start-assistant stop status
web/search (deprecated shim → web/search.go)
db/psql-yq (vendored)
ssh-tunnel onlyoffice pg tunnel 5433
Expand All @@ -101,7 +104,8 @@ them from each hit (1=File, 2=Commit, 3=Person). Rebuild writes
`Leaf-[:FROM_FILE]->File`; git import writes the rest.

Common props on every node/edge: `root`, `confidence`, `evidence[]`, `how`,
`where`, `when`, `source_rev`.
`where`, `when`, `source_rev`. Leaf interval of truth (D24): `valid_from`,
`valid_to`.

## Config

Expand Down Expand Up @@ -132,6 +136,8 @@ Common props on every node/edge: `root`, `confidence`, `evidence[]`, `how`,
quantiles / JSONL count. Not a second graph. [#30](https://git.produktor.io/eSlider/2dph/issues/30).
- OQ4: YAML-first storage for leafs — deferred: JSON is ~10x faster to
serialize and unambiguous; YAML only where humans edit files.
- OQ5: **in** — fact `valid_from` / `valid_to` + `--as-of` / MCP `as_of` (D24).
Not D16 `temporal_freshness`. [#36](https://git.produktor.io/eSlider/2dph/issues/36).

## Mail pipeline (done)

Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ go test ./... && uv run python -m unittest discover -s bin/tools -t .
Docker (optional, cached model + var volumes):

```bash
bin/stack/start # brain HTTP/MCP :8630
bin/stack/start-assistant # + qwen3.5:9b + PicoClaw agent
bin/stack/status
bin/stack/stop
docker compose up -d brain # API (Zig CGO serve :8630)
docker compose --profile index run --rm index # Python Ladybug rebuild
docker compose --profile picoclaw up brain-mcp # MCP on 127.0.0.1:8630
Expand Down
6 changes: 6 additions & 0 deletions bin/kb/add
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ def main(argv: list[str]) -> int:
p.add_argument("--how", default="brain/add")
p.add_argument("--loc", default="")
p.add_argument("--type", default="reference", dest="type_")
p.add_argument("--valid-from", default="", dest="valid_from",
help="fact interval start YYYY-MM-DD (D24)")
p.add_argument("--valid-to", default="", dest="valid_to",
help="fact interval end YYYY-MM-DD inclusive; empty=open (D24)")
args = p.parse_args(argv)

if args.json:
Expand All @@ -86,6 +90,8 @@ def main(argv: list[str]) -> int:
"how": args.how,
"loc": args.loc or args.source,
"type": args.type_,
"valid_from": args.valid_from,
"valid_to": args.valid_to,
}]

for lf in leafs:
Expand Down
235 changes: 235 additions & 0 deletions bin/stack/lib.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
# bin/stack/lib.sh — compose helpers for start / start-assistant / stop / status.
# Sourced, not executed. No secrets. No host-absolute paths.

BRAIN_URL="${BRAIN_URL:-http://127.0.0.1:8630}"
REASONER_URL="${REASONER_URL:-http://127.0.0.1:11435}"
PICOCLAW_URL="${PICOCLAW_URL:-http://127.0.0.1:18790}"
REASONER_MODEL="${REASONER_MODEL:-qwen3.5:9b}"
STACK_WAIT_SECS="${STACK_WAIT_SECS:-90}"
STACK_WAIT_INTERVAL="${STACK_WAIT_INTERVAL:-2}"
STACK_PULL_SECS="${STACK_PULL_SECS:-600}"

if [[ -z "${ROOT:-}" ]]; then
STACK_DIR="$(CDPATH= cd -- "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ROOT="$(CDPATH= cd -- "$STACK_DIR/../.." && pwd)"
fi

stack_usage() {
awk 'NR == 1 { next } /^#/ { sub(/^# ?/, ""); print; next } { exit }' "$1"
}

stack_die() {
echo "bin/stack: $*" >&2
return 1
}

compose() {
docker compose -f "$ROOT/compose.yaml" --project-directory "$ROOT" "$@"
}

http_get() {
local url=$1
local timeout=${2:-5}
curl -sS --max-time "$timeout" "$url" 2>/dev/null || return 1
}

health_ok() {
local url=$1
local timeout=${2:-5}
local body
body=$(http_get "$url" "$timeout") || return 1
printf '%s' "$body" | grep -q '"status":"ok"'
}

wait_health() {
local url=$1
local n=0
while ((n <= STACK_WAIT_SECS)); do
if health_ok "$url"; then
return 0
fi
n=$((n + 1))
if ((n <= STACK_WAIT_SECS)); then
sleep "$STACK_WAIT_INTERVAL"
fi
done
return 1
}

wait_http() {
local url=$1
local n=0
while ((n <= STACK_WAIT_SECS)); do
if http_get "$url" 5 >/dev/null; then
return 0
fi
n=$((n + 1))
if ((n <= STACK_WAIT_SECS)); then
sleep "$STACK_WAIT_INTERVAL"
fi
done
return 1
}

mcp_body() {
curl -sS --max-time 10 \
-H 'Content-Type: application/json' \
-d '{"jsonrpc":"2.0","id":1,"method":"tools/list"}' \
"$BRAIN_URL/mcp" 2>/dev/null || return 1
}

mcp_ok() {
local body
body=$(mcp_body) || return 1
printf '%s' "$body" | grep -Eq '"name": ?"search"' || return 1
printf '%s' "$body" | grep -Eq '"name": ?"get"' || return 1
printf '%s' "$body" | grep -Eq '"name": ?"audit"' || return 1
return 0
}

reasoner_tags() {
http_get "$REASONER_URL/api/tags" 5
}

reasoner_has_model() {
local body
body=$(reasoner_tags) || return 1
printf '%s' "$body" | grep -Fq "$REASONER_MODEL"
}

ensure_mcp() {
mcp_ok || stack_die "MCP tools/list missing search/get/audit at $BRAIN_URL/mcp"
}

ensure_brain() {
if health_ok "$BRAIN_URL/health"; then
echo "brain: reuse $BRAIN_URL" >&2
else
echo "brain: compose up" >&2
compose up -d brain
wait_health "$BRAIN_URL/health" || stack_die "brain health failed at $BRAIN_URL/health"
fi
ensure_mcp
}

pull_reasoner_model() {
echo "reasoner: pulling $REASONER_MODEL (CPU, may take minutes)" >&2
curl -sS --max-time "$STACK_PULL_SECS" \
-H 'Content-Type: application/json' \
-d "{\"name\":\"$REASONER_MODEL\"}" \
"$REASONER_URL/api/pull" >/dev/null
}

ensure_reasoner() {
if reasoner_has_model; then
echo "reasoner: reuse $REASONER_URL model $REASONER_MODEL" >&2
return 0
fi
if ! reasoner_tags >/dev/null; then
echo "reasoner: compose up" >&2
compose --profile reasoner up -d reasoner
wait_http "$REASONER_URL/api/tags" || stack_die "reasoner not listening at $REASONER_URL"
fi
if reasoner_has_model; then
return 0
fi
pull_reasoner_model
reasoner_has_model || stack_die "reasoner missing model $REASONER_MODEL"
}

ensure_picoclaw() {
echo "picoclaw: compose up --no-deps (reuse healthy :8630/:11435)" >&2
compose --profile picoclaw up -d --no-deps picoclaw
wait_health "$PICOCLAW_URL/health" || stack_die "picoclaw health failed at $PICOCLAW_URL/health"
}

stack_status() {
local bh=down mcp=down ph=down present=false
health_ok "$BRAIN_URL/health" && bh=ok
mcp_ok && mcp=ok
reasoner_has_model && present=true
health_ok "$PICOCLAW_URL/health" && ph=ok
cat <<EOF
brain:
url: $BRAIN_URL
health: $bh
mcp: $mcp
reasoner:
url: $REASONER_URL
model: $REASONER_MODEL
present: $present
picoclaw:
url: $PICOCLAW_URL
health: $ph
EOF
}

stack_start() {
ensure_brain
}

stack_attach_agent() {
local opts=()
if [[ -t 0 && -t 1 ]]; then
opts+=(-it)
else
opts+=(-T)
fi
if [[ (! -t 0 || ! -t 1) && $# -eq 0 ]]; then
echo "picoclaw: no TTY. Attach with:" >&2
echo " $ROOT/bin/stack/start-assistant" >&2
echo " docker compose --profile picoclaw exec -it picoclaw picoclaw agent" >&2
return 0
fi
echo "picoclaw: agent (search → get → audit before a factual reply)" >&2
exec docker compose -f "$ROOT/compose.yaml" --project-directory "$ROOT" \
--profile picoclaw exec "${opts[@]}" picoclaw picoclaw agent "$@"
}

stack_start_assistant() {
local attach=1
local agent_args=()
while (($#)); do
case "$1" in
-h | --help)
stack_usage "$ROOT/bin/stack/start-assistant"
return 0
;;
--no-attach)
attach=0
shift
;;
--)
shift
agent_args+=("$@")
break
;;
*)
agent_args+=("$1")
shift
;;
esac
done
stack_start
ensure_reasoner
ensure_picoclaw
stack_status
if ((attach == 0)); then
echo "picoclaw: gateway $PICOCLAW_URL (agent not attached)" >&2
echo "ask the brain: $ROOT/bin/stack/start-assistant" >&2
echo "one-shot: $ROOT/bin/stack/start-assistant -- -m \"search the 2dph brain for LadybugDB\"" >&2
return 0
fi
stack_attach_agent "${agent_args[@]}"
}

stack_stop() {
case "${1:-}" in
-h | --help)
stack_usage "$ROOT/bin/stack/stop"
return 0
;;
esac
echo "stack: stop brain brain-mcp reasoner picoclaw (volumes kept)" >&2
compose --profile picoclaw --profile reasoner stop picoclaw brain-mcp reasoner brain
}
21 changes: 21 additions & 0 deletions bin/stack/start
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env bash
# bin/stack/start - bring up brain HTTP/MCP and wait until search/get/audit respond.
#
# bin/stack/start
# bin/stack/status
#
# Reuses a healthy process on :8630 (host serve or compose). Does not start
# PicoClaw. Does not rebuild Ladybug.
set -euo pipefail

STACK_DIR="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
# shellcheck source=lib.sh
source "$STACK_DIR/lib.sh"
case "${1:-}" in
-h | --help)
stack_usage "$0"
exit 0
;;
esac
stack_start "$@"
stack_status
15 changes: 15 additions & 0 deletions bin/stack/start-assistant
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
# bin/stack/start-assistant - start + CPU reasoner + PicoClaw, then attach agent.
#
# bin/stack/start-assistant
# bin/stack/start-assistant --no-attach
# bin/stack/start-assistant -- -m "search the 2dph brain for LadybugDB"
#
# Pulls qwen3.5:9b if missing. Gateway :18790. Agent uses MCP search → get → audit.
# --no-attach leaves the gateway up without exec.
set -euo pipefail

STACK_DIR="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
# shellcheck source=lib.sh
source "$STACK_DIR/lib.sh"
stack_start_assistant "$@"
17 changes: 17 additions & 0 deletions bin/stack/status
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash
# bin/stack/status - YAML health for brain MCP, reasoner model, PicoClaw gateway.
#
# bin/stack/status
# bin/stack/status | yq '.picoclaw'
set -euo pipefail

STACK_DIR="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
# shellcheck source=lib.sh
source "$STACK_DIR/lib.sh"
case "${1:-}" in
-h | --help)
stack_usage "$0"
exit 0
;;
esac
stack_status
Loading
Loading