selftune 0.2.6 → 0.2.8

package/cli/selftune/constants.ts

@@ -5,10 +5,22 @@
 import { homedir } from "node:os";
 import { join } from "node:path";
 
-export const SELFTUNE_CONFIG_DIR = join(homedir(), ".selftune");
+const resolvedHome = process.env.SELFTUNE_HOME;
+const defaultHome = resolvedHome ?? homedir();
+const claudeHomeDir =
+  process.env.SELFTUNE_CLAUDE_DIR ??
+  (resolvedHome ? join(defaultHome, ".claude") : join(homedir(), ".claude"));
+const openclawHomeDir =
+  process.env.SELFTUNE_OPENCLAW_DIR ??
+  (resolvedHome ? join(defaultHome, ".openclaw") : join(homedir(), ".openclaw"));
+
+export const SELFTUNE_CONFIG_DIR =
+  (process.env.SELFTUNE_CONFIG_DIR || undefined) ??
+  (resolvedHome ? join(defaultHome, ".selftune") : join(homedir(), ".selftune"));
+
 export const SELFTUNE_CONFIG_PATH = join(SELFTUNE_CONFIG_DIR, "config.json");
 
-export const LOG_DIR = join(homedir(), ".claude");
+export const LOG_DIR = (process.env.SELFTUNE_LOG_DIR || undefined) ?? claudeHomeDir;
 
 export const TELEMETRY_LOG = join(LOG_DIR, "session_telemetry_log.jsonl");
 export const SKILL_LOG = join(LOG_DIR, "skill_usage_log.jsonl");
@@ -106,22 +118,30 @@ export function canonicalSessionStatePath(sessionId: string): string {
 }
 
 /** Claude Code settings file path. */
-export const CLAUDE_SETTINGS_PATH = join(homedir(), ".claude", "settings.json");
+export const CLAUDE_SETTINGS_PATH =
+  process.env.SELFTUNE_CLAUDE_SETTINGS_PATH ?? join(claudeHomeDir, "settings.json");
 
 /** Path to Claude Code projects directory containing session transcripts. */
-export const CLAUDE_CODE_PROJECTS_DIR = join(homedir(), ".claude", "projects");
+export const CLAUDE_CODE_PROJECTS_DIR =
+  process.env.SELFTUNE_CLAUDE_PROJECTS_DIR ?? join(claudeHomeDir, "projects");
 
 /** Marker file tracking which Claude Code sessions have been ingested. */
-export const CLAUDE_CODE_MARKER = join(homedir(), ".claude", "claude_code_ingested_sessions.json");
+export const CLAUDE_CODE_MARKER =
+  process.env.SELFTUNE_CLAUDE_MARKER_PATH ??
+  join(claudeHomeDir, "claude_code_ingested_sessions.json");
 
 /** Marker file tracking which Codex rollout files have been ingested. */
-export const CODEX_INGEST_MARKER = join(homedir(), ".claude", "codex_ingested_rollouts.json");
+export const CODEX_INGEST_MARKER =
+  process.env.SELFTUNE_CODEX_MARKER_PATH ?? join(claudeHomeDir, "codex_ingested_rollouts.json");
 
 /** Marker file tracking which OpenCode sessions have been ingested. */
-export const OPENCODE_INGEST_MARKER = join(homedir(), ".claude", "opencode_ingested_sessions.json");
+export const OPENCODE_INGEST_MARKER =
+  process.env.SELFTUNE_OPENCODE_MARKER_PATH ??
+  join(claudeHomeDir, "opencode_ingested_sessions.json");
 
 /** OpenClaw agents directory containing session data. */
-export const OPENCLAW_AGENTS_DIR = join(homedir(), ".openclaw", "agents");
+export const OPENCLAW_AGENTS_DIR =
+  process.env.SELFTUNE_OPENCLAW_AGENTS_DIR ?? join(openclawHomeDir, "agents");
 
 /** Marker file tracking which OpenClaw sessions have been ingested. */
 export const OPENCLAW_INGEST_MARKER = join(SELFTUNE_CONFIG_DIR, "openclaw-ingest-marker.json");

package/cli/selftune/contribute/bundle.ts

@@ -16,6 +16,13 @@ import {
   TELEMETRY_LOG,
 } from "../constants.js";
 import { buildEvalSet, classifyInvocation } from "../eval/hooks-to-evals.js";
+import { getDb } from "../localdb/db.js";
+import {
+  queryEvolutionAudit,
+  queryQueryLog,
+  querySessionTelemetry,
+  querySkillUsageRecords,
+} from "../localdb/queries.js";
 import type {
   ContributionBundle,
   ContributionEvolutionSummary,
@@ -203,11 +210,31 @@ export function assembleBundle(options: {
     evolutionAuditLogPath = EVOLUTION_AUDIT_LOG,
   } = options;
 
-  // Read all logs
-  const allSkillRecords = readJsonl<SkillUsageRecord>(skillLogPath);
-  const allQueryRecords = readJsonl<QueryLogRecord>(queryLogPath);
-  const allTelemetryRecords = readJsonl<SessionTelemetryRecord>(telemetryLogPath);
-  const allEvolutionRecords = readJsonl<EvolutionAuditEntry>(evolutionAuditLogPath);
+  // Read from JSONL when custom (non-default) paths are provided (test isolation),
+  // otherwise read from SQLite (production).
+  const useJsonl =
+    queryLogPath !== QUERY_LOG ||
+    skillLogPath !== SKILL_LOG ||
+    telemetryLogPath !== TELEMETRY_LOG ||
+    evolutionAuditLogPath !== EVOLUTION_AUDIT_LOG;
+
+  let allSkillRecords: SkillUsageRecord[];
+  let allQueryRecords: QueryLogRecord[];
+  let allTelemetryRecords: SessionTelemetryRecord[];
+  let allEvolutionRecords: EvolutionAuditEntry[];
+
+  if (useJsonl) {
+    allSkillRecords = readJsonl<SkillUsageRecord>(skillLogPath);
+    allQueryRecords = readJsonl<QueryLogRecord>(queryLogPath);
+    allTelemetryRecords = readJsonl<SessionTelemetryRecord>(telemetryLogPath);
+    allEvolutionRecords = readJsonl<EvolutionAuditEntry>(evolutionAuditLogPath);
+  } else {
+    const db = getDb();
+    allSkillRecords = querySkillUsageRecords(db) as SkillUsageRecord[];
+    allQueryRecords = queryQueryLog(db) as QueryLogRecord[];
+    allTelemetryRecords = querySessionTelemetry(db) as SessionTelemetryRecord[];
+    allEvolutionRecords = queryEvolutionAudit(db) as EvolutionAuditEntry[];
+  }
 
   // Filter by skill and since
   const skillRecords = filterSince(

package/cli/selftune/dashboard-contract.ts

@@ -28,6 +28,7 @@ export interface EvalSnapshot {
 export interface EvolutionEntry {
   timestamp: string;
   proposal_id: string;
+  skill_name?: string;
   action: string;
   details: string;
   eval_snapshot?: EvalSnapshot | null;
@@ -96,12 +97,18 @@ export interface EvidenceEntry {
 
 export interface CanonicalInvocation {
   timestamp: string;
+  occurred_at?: string;
   session_id: string;
   skill_name: string;
   invocation_mode: string | null;
   triggered: boolean;
   confidence: number | null;
   tool_name: string | null;
+  agent_type?: string | null;
+  query?: string | null;
+  source?: string | null;
+  skill_path?: string | null;
+  skill_scope?: string | null;
 }
 
 export interface PromptSample {
@@ -131,6 +138,11 @@ export interface SkillReportPayload {
     triggered_count: number;
     pass_rate: number;
   };
+  /**
+   * @deprecated Use `canonical_invocations` from SkillReportResponse instead.
+   * Retained for backward compatibility; the backend now returns unified data
+   * in `canonical_invocations` from the consolidated `skill_invocations` table.
+   */
   recent_invocations: Array<{
     timestamp: string;
     session_id: string;
@@ -174,6 +186,25 @@ export interface OrchestrateRunsResponse {
   runs: OrchestrateRunReport[];
 }
 
+// -- Health endpoint response -------------------------------------------------
+
+export interface HealthResponse {
+  ok: boolean;
+  service: string;
+  version: string;
+  spa: boolean;
+  v2_data_available: boolean;
+  workspace_root: string;
+  git_sha: string;
+  db_path: string;
+  log_dir: string;
+  config_dir: string;
+  watcher_mode: "jsonl" | "none";
+  process_mode: "standalone" | "dev-server" | "test";
+  host: string;
+  port: number;
+}
+
 // -- Doctor / health check types ----------------------------------------------
 export type { DoctorResult, HealthCheck, HealthStatus } from "./types.js";
 
@@ -189,7 +220,7 @@ export interface SkillReportResponse extends SkillReportPayload {
     avg_duration_ms: number;
     total_duration_ms: number;
     execution_count: number;
-    total_errors: number;
+    missed_triggers: number;
   };
   selftune_stats: {
     total_llm_calls: number;