Resolve conflicts for PR #13

Author: Michael

.agent-os/instructions/core/pr-merge-runbook.md

@@ -0,0 +1,84 @@
+# PR Merge Runbook — Truth Kernel Branches
+
+Purpose: deterministically open and merge our three current branches using either the GitHub UI or the repo’s helper script. This file is the canonical reference for future threads.
+
+## Branches
+1. **PR 1** (audit fix) → `fix/audit-hyphenated-identifiers` → `main`
+2. **PR 2** (node test runner) → `test/node-runner` → `main`
+3. **PR 3** (docs) → `docs/truthlens-readme-status` → `main` (after rebasing on merged PR1+PR2)
+
+---
+
+## Option A — GitHub UI (simplest)
+1. Open each “Compare & pull request” link for the three branches.
+2. Titles/Bodies:
+   - PR 1 — **Title:** `fix(audit): ignore code blocks; tighten pronoun detection`  
+     **Body:** Refines simulation detection to skip fenced/inline code and avoid hyphen/underscore-bound identifiers. Adds unit tests.
+   - PR 2 — **Title:** `test: switch to Node built-in runner; convert audit tests`  
+     **Body:** Replaces Mocha semantics with node:test. Updates package.json test script. Ensures zero-deps test execution in CI.
+   - PR 3 — **Title:** `docs: TruthLens runtime + audit; compliance quick checks; Codex workflow`  
+     **Body:** README adds TruthLens + CI gate overview; STATUS adds compliance quick checks; TruthLens policy page gains canonical pointers.
+3. Labels:
+   - PR 1: `truth-kernel`, `audit`
+   - PR 2: `tests`, `truth-kernel`
+   - PR 3: `docs`, `truth-kernel`
+4. Merge order:
+   - Merge PR 1 → Merge PR 2 → Rebase `docs/truthlens-readme-status` on `main`, then open & merge PR 3.
+
+---
+
+## Option B — Helper script (no gh CLI)
+**Prereq:** create a GitHub Personal Access Token (repo scope). Export it in your shell:
+```bash
+export GITHUB_TOKEN=<YOUR_REPO_SCOPED_TOKEN>
+```
+Run these commands from the repo root (Ubuntu).
+
+### 1) PR 1 — audit fix
+```bash
+node tools/gh-pr-open-and-merge.cjs \
+  --repo mrhpython/Soulfield \
+  --base main \
+  --head fix/audit-hyphenated-identifiers \
+  --title "fix(audit): ignore code blocks; tighten pronoun detection" \
+  --body "Refines simulation detection to skip fenced/inline code and avoid hyphen/underscore-bound identifiers. Adds unit tests." \
+  --labels "truth-kernel,audit"
+```
+### 2) PR 2 — node test runner
+```bash
+node tools/gh-pr-open-and-merge.cjs \
+  --repo mrhpython/Soulfield \
+  --base main \
+  --head test/node-runner \
+  --title "test: switch to Node built-in runner; convert audit tests" \
+  --body "Replaces Mocha semantics with node:test. Updates package.json test script. Ensures zero-deps test execution in CI." \
+  --labels "tests,truth-kernel"
+```
+### 3) Rebase docs branch after PR 1 & 2 merge
+```bash
+git switch docs/truthlens-readme-status
+git fetch origin
+git rebase origin/main
+npm ci && npm test && node backend/scripts/audit-truth.cjs
+```
+### 4) PR 3 — docs
+```bash
+node tools/gh-pr-open-and-merge.cjs \
+  --repo mrhpython/Soulfield \
+  --base main \
+  --head docs/truthlens-readme-status \
+  --title "docs: TruthLens runtime + audit; compliance quick checks; Codex workflow" \
+  --body "README adds TruthLens + CI gate overview; STATUS adds compliance quick checks; TruthLens policy page gains canonical pointers." \
+  --labels "docs,truth-kernel"
+```
+
+---
+
+## Notes
+- TruthLens is the governing policy; all outputs are wrapped at runtime:contentReference[oaicite:5]{index=5} and documented as OS intent:contentReference[oaicite:6]{index=6}.
+- Non-simulation contract applies to all agent outputs:contentReference[oaicite:7]{index=7}.
+- CI gate runs the Truth audit + tests on every push/PR.
+
+## Troubleshooting
+- If the helper reports “CI failed”, click into the PR checks to view logs. Fix locally, push to the branch, rerun the helper.
+- If `git rebase` reports conflicts, resolve locally, `git add <files> && git rebase --continue`, then rerun the PR 3 helper command.

.chatgpt/commands/brain-dump-analysis.md

@@ -0,0 +1,23 @@
+# /brain-dump-analysis
+
+Purpose: synthesize braindumps into themes, questions, breached rules, and realizations.
+
+Process:
+- Read `braindumps/` markdown files.
+- Extract keywords and frequent phrases.
+- Identify questions (“?”), and lines like “rule(s) I keep breaking…”.
+- Output ASCII mind map + bullet lists.
+
+Output: `braindumps/analysis/insights-YYYY-MM-DD.md`
+
+## Usage
+
+Ensure you have markdown files under `braindumps/`, then run:
+
+```
+node tools/brain-dump-analysis.cjs
+# or
+node tools/sf.cjs brain-dump-analysis
+```
+
+Generates: `braindumps/analysis/insights-<today>.md` containing themes, questions, and a simple ASCII mind map.

.chatgpt/commands/daily-brief.md

@@ -0,0 +1,24 @@
+# /daily-brief (markets)
+
+Purpose: structured market preparation without external calls.
+
+Sources:
+- Local workspace markdowns (keywords/interests)
+
+Content:
+- Sessions for ES + majors FX (placeholders OK)
+- Checklist: econ calendar, overnight ranges, ATR%, key levels
+- Why-each-item-matters notes
+- Action checklist slots
+
+Output: `briefs/daily-brief-YYYY-MM-DD.md`
+
+## Usage
+
+```
+node tools/daily-brief.cjs
+# or
+node tools/sf.cjs daily-brief
+```
+
+The brief is structure-only (no web calls). Fill checklist items manually.

.chatgpt/commands/daily-checkin.md

@@ -0,0 +1,34 @@
+# /daily-checkin
+
+Purpose: end-of-day reflection and planning.
+
+Prompts:
+- mood 1–10, energy 1–10
+- top 3 wins
+- tomorrow’s #1
+- blockers
+
+Outputs:
+- `journal/daily/YYYY-MM-DD.md`
+- `journal/daily/YYYY-MM-DD-reflection.md` (trend of last 3 days, momentum score, suggestions, best time block)
+
+## Usage
+
+Run from repo root (Node ≥ 20):
+
+```
+node tools/daily-checkin.cjs
+# or
+node tools/sf.cjs daily-checkin
+```
+
+Non-interactive (smoke) via env (good for tests/automation):
+
+```
+TEST_INPUT='{"mood":7,"energy":6,"wins":"win1;win2;win3","tomorrow1":"Top focus","blockers":"X"}' \
+  node tools/daily-checkin.cjs
+```
+
+Files written:
+- `journal/daily/<today>.md`
+- `journal/daily/<today>-reflection.md`

.chatgpt/commands/weekly-checkin.md

@@ -0,0 +1,39 @@
+# /weekly-checkin
+
+Purpose: capture weekly TRADING + STUDY metrics and generate a compact report.
+
+Prompts to collect:
+- TRADING: R values list, regime tag, volatility proxy.
+- STUDY: focused hours, problems solved, PRs merged, tests added, coverage %, commits, learning sprints, notes.
+
+Calculations:
+- Expectancy (R) = average(R)
+- Win rate = wins / N
+- Max drawdown (R) = min cumulative R trough
+- Kelly-lite (informational) = winrate – (1 – winrate)/(avg_win_R/|avg_loss_R|)
+- Study velocity = focused_hours + problems_solved*0.5 + PRs*0.5
+
+Outputs:
+- Append JSON block to `metrics/metrics-history.md`
+- Create `metrics/weekly-report-YYYY-MM-DD.md` with tables, deltas, emoji signals, and 3–5 recommendations.
+
+## Usage
+
+Interactive:
+
+```
+node tools/weekly-checkin.cjs
+# or
+node tools/sf.cjs weekly-checkin
+```
+
+Non-interactive (CI/smoke):
+
+```
+TEST_INPUT='{"R_list":"1 -0.5 0.7","focused_hours":5,"problems_solved":4,"prs_merged":2}' \
+  node tools/weekly-checkin.cjs
+```
+
+Artifacts:
+- `metrics/metrics-history.md` (appended block)
+- `metrics/weekly-report-<today>.md`

.chatgpt/subagents/daily-reflection.md

@@ -0,0 +1,9 @@
+System: You are ChatGPT daily reflection coach. Keep tone supportive and brief.
+
+Input: mood (1–10), energy (1–10), top wins, blockers, last 3 days trends.
+Output:
+- Tiny trend for mood/energy (up/down/flat)
+- Accomplishment momentum score
+- 2–3 gentle suggestions
+- Best time block for tomorrow (AM if trend up, PM otherwise)
+

.chatgpt/subagents/metrics-analyst.md

@@ -0,0 +1,8 @@
+System: You are ChatGPT metrics analyst. Be concise, numerical, and actionable. Use tables, deltas, and emoji signals (🚀 📈 📉 ➡️).
+
+Given weekly TRADING R data and STUDY metrics, compute:
+- Expectancy (R), Win rate, Max drawdown (R)
+- Kelly-lite signal (informational only)
+- Study velocity
+Then produce 3–5 concrete recommendations.
+

.env.example

@@ -1,15 +1,70 @@
-## Copy to `.env` and fill values
+## Copy this file to `.env` and fill in values.
+## Only `.env` is loaded at runtime; this is just a template.
 
-# Core
+# ---- Core (Aiden / API server) ----
+# Anthropic key (preferred env var name)
+ANTHROPIC_API_KEY=
+# Legacy/alternate name (also supported)
 CLAUDE_API_KEY=
-AIDEN_MODEL=
+# Claude model used by Aiden
+AIDEN_MODEL=claude-opus-4.1-20250805
+# Run offline when 1 (returns "dev offline"); set 0 for live API calls
+DEV_NO_API=0
+# HTTP port for backend/index.cjs
+PORT=8790
+CONTEXT_SPINE=0
+
+# ---- Embeddings ----
+# Provider for text embeddings used by memory and context spine
+EMBED_PROVIDER=local                 # local | openai
+# Model name for OpenAI provider only
+EMBED_MODEL=text-embedding-3-small   # used only if EMBED_PROVIDER=openai
+# Heartbeat embedding throttle (embed 1 of every N heartbeats)
+HEARTBEAT_EMBED_EVERY=4              # embed one of every N heartbeats
+OBSIDIAN_DIR=./workspace/docs/Obsidian
+NOTES_DIR=./workspace/docs/Obsidian
+
+# Retention (days) for context items (heartbeats/calendar past events)
+CONTEXT_RETENTION_DAYS=14
+
+# ---- Vector Memory (Pinecone + embeddings) ----
+# Enable Pinecone-backed memory (1 to enable)
+USE_PINECONE=0
+# Pinecone credentials and index settings
+PINECONE_API_KEY=
+PINECONE_INDEX=soulfield-memory
+PINECONE_CLOUD=aws
+PINECONE_REGION=us-east-1
+# OpenAI API key for embeddings (1536-dim)
 OPENAI_API_KEY=
+# Optional: batch size for upserts
+MEMORY_UPSERT_BATCH=64
 
-# Optional adapters
+# ---- Adapters ----
+# Jina API (embeddings/rerank)
 JINA_API_KEY=
+# Default embedding model for tools/test-memory-suite.cjs
+JINA_MODEL=jina-embeddings-v2-base-en
+
+# InfraNodus API
 INFRANODUS_API_KEY=
+# Optional custom base URL
+INFRANODUS_API_BASE=https://api.infranodus.com
 
-# Vector memory (optional)
-USE_PINECONE=0
-PINECONE_API_KEY=
+# Bright Data (scraper)
+BRIGHTDATA_TOKEN=
+
+# ---- Misc / Tooling ----
+# GitHub automation scripts
+GITHUB_TOKEN=
+# Optional hint if you swap embedding providers (not read by current code)
+# EMBED_PROVIDER=openai
 
+# ---- Google Calendar (OAuth2) ----
+# Used by contextSpine.js for calendar sync
+GCAL_CLIENT_ID=
+GCAL_CLIENT_SECRET=
+GCAL_REDIRECT_URI=
+GCAL_REFRESH_TOKEN=
+GCAL_WINDOW_HOURS=24
+GCAL_CALENDAR_ID=primary

.github/workflows/ci.yml

@@ -2,9 +2,14 @@ name: CI
 
 on:
   push:
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
     branches: [ main, feat/**, fix/**, docs/**, chore/** ]
+>>>>>>> origin/main
+>>>>>>> origin/main
   pull_request:
-    branches: [ main ]
 
 jobs:
   node:
@@ -19,8 +24,28 @@ jobs:
           cache: 'npm'
       - name: Install deps
         run: npm ci
+<<<<<<< HEAD
+      - name: API health (offline)
+        run: |
+          DEV_NO_API=1 node backend/index.cjs & echo $! > api.pid
+          for i in {1..20}; do
+            if curl -fsS http://127.0.0.1:8790/health >/dev/null; then
+              curl -fsS http://127.0.0.1:8790/health | tee health.json; break
+            fi
+            sleep 0.3
+          done
+          kill $(cat api.pid)
+      - name: Run ESLint (npx ESLint v8)
+        run: npx -y eslint@8 .
+        continue-on-error: true
+      - name: Lint (if present)
+        run: npm run -s lint --if-present
+      - name: Test (if present)
+        run: npm run -s test --if-present
+=======
       - name: Run tests (node:test)
         run: npm test
+>>>>>>> origin/main
 
   python:
     runs-on: ubuntu-latest
@@ -31,5 +56,22 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
+<<<<<<< HEAD
+      - name: Install deps (if requirements.txt)
+        run: |
+          if [ -f requirements.txt ]; then
+            python -m pip install --upgrade pip
+            pip install -r requirements.txt
+          fi
+      - name: Run pytest if tests are present
+        run: |
+          if ls -1 tests test_*.py 2>/dev/null | grep -q .; then
+            pip install pytest
+            PYTHONPATH=. pytest -q
+          else
+            echo "No python tests found; skipping"
+          fi
+=======
       - name: Sanity
         run: python --version
+>>>>>>> origin/main