selftune 0.2.8 → 0.2.10

package/cli/selftune/init.ts

@@ -8,7 +8,7 @@
  *
  * Usage:
  *   selftune init [--agent <type>] [--cli-path <path>] [--force]
- *   selftune init --enable-autonomy [--schedule-format cron|launchd|systemd]
+ *   selftune init [--no-sync] [--no-autonomy] [--schedule-format cron|launchd|systemd]
  */
 
 import {
@@ -35,12 +35,20 @@ import {
   readAlphaIdentity,
 } from "./alpha-identity.js";
 import { TELEMETRY_NOTICE } from "./analytics.js";
-import { pollDeviceCode, requestDeviceCode } from "./auth/device-code.js";
+import {
+  buildVerificationUrl,
+  pollDeviceCode,
+  requestDeviceCode,
+  tryOpenUrl,
+} from "./auth/device-code.js";
+import { installAgentFiles } from "./claude-agents.js";
 import { CLAUDE_CODE_HOOK_KEYS, SELFTUNE_CONFIG_DIR, SELFTUNE_CONFIG_PATH } from "./constants.js";
 import type { AgentCommandGuidance, AlphaIdentity, SelftuneConfig } from "./types.js";
 import { hookKeyHasSelftuneEntry } from "./utils/hooks.js";
 import { detectAgent } from "./utils/llm-call.js";
 
+export { installAgentFiles } from "./claude-agents.js";
+
 interface InitCliErrorPayload extends AgentCommandGuidance {
   error: string;
 }
@@ -309,19 +317,6 @@ export function installClaudeCodeHooks(options?: {
   return addedKeys;
 }
 
-// ---------------------------------------------------------------------------
-// Agent file installation
-// ---------------------------------------------------------------------------
-
-/**
- * @deprecated Agent files are now bundled in skill/agents/ and read directly
- * by the consuming agent via progressive disclosure. No installation needed.
- * Kept as a no-op for backwards compatibility with callers.
- */
-export function installAgentFiles(_options?: { homeDir?: string; force?: boolean }): string[] {
-  return [];
-}
-
 // ---------------------------------------------------------------------------
 // Workspace type detection
 // ---------------------------------------------------------------------------
@@ -456,7 +451,38 @@ export interface InitOptions {
   noAlpha?: boolean;
   alphaEmail?: string;
   alphaName?: string;
-  alphaKey?: string;
+}
+
+function validateAlphaMetadataFlags(
+  alpha: boolean | undefined,
+  email?: string,
+  name?: string,
+): void {
+  if ((email !== undefined || name !== undefined) && !alpha) {
+    throw new Error("--alpha-email and --alpha-name require --alpha");
+  }
+}
+
+function assertValidApprovedAlphaCredential(result: {
+  api_key: string;
+  cloud_user_id: string;
+  org_id: string;
+}): void {
+  if (!isValidApiKeyFormat(result.api_key)) {
+    throw new Error(
+      "Device-code approval returned an invalid alpha credential. Re-run `selftune init --alpha`.",
+    );
+  }
+  if (!result.cloud_user_id?.trim()) {
+    throw new Error(
+      "Device-code approval did not include a cloud user id. Re-run `selftune init --alpha`.",
+    );
+  }
+  if (!result.org_id?.trim()) {
+    throw new Error(
+      "Device-code approval did not include an alpha org id. Re-run `selftune init --alpha`.",
+    );
+  }
 }
 
 // ---------------------------------------------------------------------------
@@ -469,12 +495,19 @@ export interface InitOptions {
  */
 export async function runInit(opts: InitOptions): Promise<SelftuneConfig> {
   const { configDir, configPath, force } = opts;
+  validateAlphaMetadataFlags(opts.alpha, opts.alphaEmail, opts.alphaName);
 
-  // If config exists and no --force, return existing
-  if (!force && existsSync(configPath)) {
+  // If config exists and no --force (and no alpha mutation), return existing
+  const hasAlphaMutation =
+    opts.alpha || opts.noAlpha || opts.alphaEmail !== undefined || opts.alphaName !== undefined;
+  if (!force && !hasAlphaMutation && existsSync(configPath)) {
     const raw = readFileSync(configPath, "utf-8");
     try {
-      return JSON.parse(raw) as SelftuneConfig;
+      const existingConfig = JSON.parse(raw) as SelftuneConfig;
+      if (existingConfig.agent_type === "claude_code") {
+        installAgentFiles({ homeDir: opts.homeDir });
+      }
+      return existingConfig;
     } catch (err) {
       throw new Error(
         `Config file at ${configPath} contains invalid JSON. Delete it or use --force to reinitialize. Cause: ${err instanceof Error ? err.message : String(err)}`,
@@ -510,81 +543,53 @@ export async function runInit(opts: InitOptions): Promise<SelftuneConfig> {
 
   let validatedAlphaIdentity: AlphaIdentity | null = null;
   if (opts.alpha) {
-    if (opts.alphaKey) {
-      // Direct key entry path — backward compatible, requires email
-      if (!opts.alphaEmail) {
-        throw new InitCliError({
-          error: "alpha_email_required",
-          message:
-            "The --alpha-email flag is required when using --alpha-key. Run: selftune init --alpha --alpha-email user@example.com --alpha-key st_live_<key>",
-          next_command: "selftune init --alpha --alpha-email <email> --alpha-key st_live_<key>",
-          suggested_commands: ["selftune init --alpha", "selftune status"],
-          blocking: true,
-          code: "alpha_email_required",
-        });
-      }
-
-      if (!isValidApiKeyFormat(opts.alphaKey)) {
-        throw new InitCliError({
-          error: "invalid_api_key_format",
-          message: "API key must start with 'st_live_' or 'st_test_'. Check the key and retry.",
-          next_command: "selftune init --alpha --alpha-email <email> --alpha-key st_live_<key>",
-          suggested_commands: ["selftune status", "selftune doctor"],
-          blocking: true,
-          code: "invalid_api_key_format",
-        });
-      }
-
-      validatedAlphaIdentity = {
-        enrolled: true,
-        user_id: existingAlphaBeforeOverwrite?.user_id ?? generateUserId(),
-        email: opts.alphaEmail,
-        display_name: opts.alphaName,
-        consent_timestamp: new Date().toISOString(),
-        api_key: opts.alphaKey,
-      };
-    } else {
-      // Device-code flow — no key provided, authenticate via browser
-      process.stderr.write("[alpha] Starting device-code authentication flow...\n");
+    // Device-code flow — authenticate via browser approval
+    process.stderr.write("[alpha] Starting device-code authentication flow...\n");
 
-      const grant = await requestDeviceCode();
+    const grant = await requestDeviceCode();
+    const verificationUrlWithCode = buildVerificationUrl(grant.verification_url, grant.user_code);
 
-      // Emit structured JSON for the agent to parse
-      console.log(
-        JSON.stringify({
-          level: "info",
-          code: "device_code_issued",
-          verification_url: grant.verification_url,
-          user_code: grant.user_code,
-          expires_in: grant.expires_in,
-          message: `Open ${grant.verification_url} and enter code: ${grant.user_code}`,
-        }),
-      );
+    // Emit structured JSON for the agent to parse
+    console.log(
+      JSON.stringify({
+        level: "info",
+        code: "device_code_issued",
+        verification_url: grant.verification_url,
+        verification_url_with_code: verificationUrlWithCode,
+        user_code: grant.user_code,
+        expires_in: grant.expires_in,
+        message: `Open ${verificationUrlWithCode} to approve.`,
+      }),
+    );
 
-      // Try to open browser
-      try {
-        const url = `${grant.verification_url}?code=${grant.user_code}`;
-        Bun.spawn(["open", url], { stdout: "ignore", stderr: "ignore" });
+    // Try to open browser (skip in test environments)
+    if (!process.env.BUN_ENV?.includes("test") && !process.env.SELFTUNE_NO_BROWSER) {
+      if (tryOpenUrl(verificationUrlWithCode)) {
         process.stderr.write(`[alpha] Browser opened. Waiting for approval...\n`);
-      } catch {
-        process.stderr.write(`[alpha] Could not open browser. Visit the URL above manually.\n`);
+      } else {
+        process.stderr.write(
+          `[alpha] Could not open browser. Visit ${verificationUrlWithCode} manually.\n`,
+        );
       }
-
-      process.stderr.write("[alpha] Polling");
-      const result = await pollDeviceCode(grant.device_code, grant.interval, grant.expires_in);
-      process.stderr.write("\n[alpha] Approved!\n");
-
-      validatedAlphaIdentity = {
-        enrolled: true,
-        user_id: existingAlphaBeforeOverwrite?.user_id ?? generateUserId(),
-        cloud_user_id: result.cloud_user_id,
-        cloud_org_id: result.org_id,
-        email: opts.alphaEmail,
-        display_name: opts.alphaName,
-        consent_timestamp: new Date().toISOString(),
-        api_key: result.api_key,
-      };
+    } else {
+      process.stderr.write(`[alpha] Visit ${verificationUrlWithCode} to approve.\n`);
     }
+
+    process.stderr.write("[alpha] Polling");
+    const result = await pollDeviceCode(grant.device_code, grant.interval, grant.expires_in);
+    assertValidApprovedAlphaCredential(result);
+    process.stderr.write("\n[alpha] Approved!\n");
+
+    validatedAlphaIdentity = {
+      enrolled: true,
+      user_id: existingAlphaBeforeOverwrite?.user_id ?? generateUserId(),
+      cloud_user_id: result.cloud_user_id,
+      cloud_org_id: result.org_id,
+      email: opts.alphaEmail ?? existingAlphaBeforeOverwrite?.email,
+      display_name: opts.alphaName ?? existingAlphaBeforeOverwrite?.display_name,
+      consent_timestamp: new Date().toISOString(),
+      api_key: result.api_key,
+    };
   }
 
   const config: SelftuneConfig = {
@@ -600,11 +605,15 @@ export async function runInit(opts: InitOptions): Promise<SelftuneConfig> {
   mkdirSync(configDir, { recursive: true });
   writeSelftuneConfig(configPath, config);
 
-  // Agent files are bundled in skill/agents/ and read directly by the
-  // consuming agent — no installation step needed.
-
   // Auto-install hooks into ~/.claude/settings.json (Claude Code only)
   if (agentType === "claude_code") {
+    const syncedAgentFiles = installAgentFiles({ homeDir: home });
+    if (syncedAgentFiles.length > 0) {
+      console.error(
+        `[INFO] Synced ${syncedAgentFiles.length} selftune agent file(s) into ${join(home, ".claude", "agents")}: ${syncedAgentFiles.join(", ")}`,
+      );
+    }
+
     const addedHookKeys = installClaudeCodeHooks({
       settingsPath,
       cliPath,
@@ -662,12 +671,13 @@ export async function cliMain(): Promise<void> {
       "cli-path": { type: "string" },
       force: { type: "boolean", default: false },
       "enable-autonomy": { type: "boolean", default: false },
+      "no-sync": { type: "boolean", default: false },
+      "no-autonomy": { type: "boolean", default: false },
       "schedule-format": { type: "string" },
       alpha: { type: "boolean", default: false },
       "no-alpha": { type: "boolean", default: false },
       "alpha-email": { type: "string" },
       "alpha-name": { type: "string" },
-      "alpha-key": { type: "string" },
     },
     strict: true,
   });
@@ -675,16 +685,25 @@ export async function cliMain(): Promise<void> {
   const configDir = SELFTUNE_CONFIG_DIR;
   const configPath = SELFTUNE_CONFIG_PATH;
   const force = values.force ?? false;
-  const enableAutonomy = values["enable-autonomy"] ?? false;
+  // Sync and autonomy are on by default; opt out with --no-sync / --no-autonomy
+  const enableSync = !(values["no-sync"] ?? false);
+  // --enable-autonomy is a backward-compatible alias (now default behavior)
+  const enableAutonomy = !values["no-autonomy"];
+  try {
+    validateAlphaMetadataFlags(values.alpha, values["alpha-email"], values["alpha-name"]);
+  } catch (error) {
+    console.error(error instanceof Error ? error.message : String(error));
+    process.exit(1);
+  }
 
   // Check for existing config without force
   const hasAlphaMutation = !!(
     values.alpha ||
     values["no-alpha"] ||
     values["alpha-email"] ||
-    values["alpha-name"] ||
-    values["alpha-key"]
+    values["alpha-name"]
   );
+  let existingConfigDetected = false;
   if (!force && !enableAutonomy && !hasAlphaMutation && existsSync(configPath)) {
     try {
       const raw = readFileSync(configPath, "utf-8");
@@ -698,6 +717,14 @@ export async function cliMain(): Promise<void> {
       );
     }
   }
+  if (!force && !hasAlphaMutation && existsSync(configPath)) {
+    try {
+      JSON.parse(readFileSync(configPath, "utf-8")) as SelftuneConfig;
+      existingConfigDetected = true;
+    } catch {
+      existingConfigDetected = false;
+    }
+  }
 
   const config = await runInit({
     configDir,
@@ -709,7 +736,6 @@ export async function cliMain(): Promise<void> {
     noAlpha: values["no-alpha"] ?? false,
     alphaEmail: values["alpha-email"],
     alphaName: values["alpha-name"],
-    alphaKey: values["alpha-key"],
   });
 
   // Redact api_key before printing to stdout
@@ -718,6 +744,9 @@ export async function cliMain(): Promise<void> {
     safeConfig.alpha.api_key = "<redacted>";
   }
   console.log(JSON.stringify(safeConfig, null, 2));
+  if (existingConfigDetected) {
+    console.error("Already initialized. Use --force to reinitialize.");
+  }
 
   // Alpha enrollment output
   if (values.alpha) {
@@ -781,6 +810,78 @@ export async function cliMain(): Promise<void> {
     }),
   );
 
+  // Backfill historical transcripts into SQLite
+  if (enableSync) {
+    try {
+      const { syncSources } = await import("./sync.js");
+      const syncResult = syncSources({
+        syncClaude: true,
+        syncCodex: true,
+        syncOpenCode: true,
+        syncOpenClaw: true,
+        rebuildSkillUsage: true,
+        dryRun: false,
+      });
+
+      const totalSynced =
+        (syncResult.sources.claude?.synced ?? 0) +
+        (syncResult.sources.codex?.synced ?? 0) +
+        (syncResult.sources.opencode?.synced ?? 0) +
+        (syncResult.sources.openclaw?.synced ?? 0);
+
+      console.log(
+        JSON.stringify({
+          level: "info",
+          code: "sync_complete",
+          sessions_synced: totalSynced,
+          repaired_records: syncResult.repair.repaired_records,
+          elapsed_ms: syncResult.total_elapsed_ms,
+        }),
+      );
+    } catch (err) {
+      // Fail-open: sync failure should not block init completion
+      console.log(
+        JSON.stringify({
+          level: "warn",
+          code: "sync_failed",
+          error: err instanceof Error ? err.message : String(err),
+        }),
+      );
+    }
+  }
+
+  // Trigger initial alpha upload if enrolled — push synced data immediately
+  if (config.alpha?.enrolled && config.alpha?.api_key) {
+    try {
+      const { runUploadCycle } = await import("./alpha-upload/index.js");
+      const { getDb } = await import("./localdb/db.js");
+      const db = getDb();
+      const uploadSummary = await runUploadCycle(db, {
+        enrolled: true,
+        userId: config.alpha.user_id,
+        apiKey: config.alpha.api_key,
+      });
+      console.log(
+        JSON.stringify({
+          level: "info",
+          code: "init_upload_complete",
+          prepared: uploadSummary.prepared,
+          sent: uploadSummary.sent,
+          failed: uploadSummary.failed,
+        }),
+      );
+    } catch (err) {
+      // Fail-open: upload failure should not block init
+      console.log(
+        JSON.stringify({
+          level: "warn",
+          code: "init_upload_failed",
+          error: err instanceof Error ? err.message : String(err),
+        }),
+      );
+    }
+  }
+
   if (enableAutonomy) {
     try {
       const { installSchedule } = await import("./schedule.js");

package/cli/selftune/localdb/db.ts

@@ -11,6 +11,7 @@
 import { Database } from "bun:sqlite";
 import { existsSync, mkdirSync } from "node:fs";
 import { dirname, join } from "node:path";
+
 import { SELFTUNE_CONFIG_DIR } from "../constants.js";
 import { ALL_DDL, MIGRATIONS, POST_MIGRATION_INDEXES } from "./schema.js";
 

package/cli/selftune/localdb/direct-write.ts

@@ -10,6 +10,8 @@
  */
 
 import type { Database } from "bun:sqlite";
+import { createHash } from "node:crypto";
+
 import type {
   CanonicalExecutionFactRecord,
   CanonicalPromptRecord,
@@ -17,10 +19,12 @@ import type {
   CanonicalSessionRecord,
   CanonicalSkillInvocationRecord,
 } from "@selftune/telemetry-contract";
+
 import type { OrchestrateRunReport } from "../dashboard-contract.js";
 import type {
   EvolutionAuditEntry,
   EvolutionEvidenceEntry,
+  GradingResult,
   SessionTelemetryRecord,
   SkillUsageRecord,
 } from "../types.js";
@@ -44,6 +48,9 @@ export interface SkillInvocationWriteInput {
   platform?: string;
   schema_version?: string;
   normalized_at?: string;
+  normalizer_version?: string;
+  capture_mode?: string;
+  raw_source_ref?: Record<string, unknown>;
   // Extra fields from skill_usage
   query?: string;
   skill_path?: string;
@@ -84,6 +91,17 @@ function safeWrite(label: string, fn: (db: Database) => void): boolean {
   }
 }
 
+function safeWriteResult<T>(label: string, fn: (db: Database) => T): T | null {
+  try {
+    return fn(getDb());
+  } catch (err) {
+    if (process.env.DEBUG || process.env.NODE_ENV === "development") {
+      console.error(`[direct-write] ${label} failed:`, err);
+    }
+    return null;
+  }
+}
+
 // -- Canonical record dispatcher -----------------------------------------------
 
 export function writeCanonicalToDb(record: CanonicalRecord): boolean {
@@ -339,6 +357,41 @@ export function writeQueryToDb(record: {
   });
 }
 
+export function writeGradingResultToDb(result: GradingResult): boolean {
+  const gradingId = `gr_${createHash("sha256").update(`${result.session_id}:${result.skill_name}:${result.graded_at}`).digest("hex").slice(0, 16)}`;
+  return safeWrite("grading-result", (db) => {
+    getStmt(
+      db,
+      "grading-result",
+      `
+      INSERT OR IGNORE INTO grading_results
+        (grading_id, session_id, skill_name, transcript_path, graded_at,
+         pass_rate, mean_score, score_std_dev, passed_count, failed_count, total_count,
+         expectations_json, claims_json, eval_feedback_json, failure_feedback_json,
+         execution_metrics_json)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `,
+    ).run(
+      gradingId,
+      result.session_id,
+      result.skill_name,
+      result.transcript_path,
+      result.graded_at,
+      result.summary.pass_rate,
+      result.summary.mean_score ?? null,
+      result.summary.score_std_dev ?? null,
+      result.summary.passed,
+      result.summary.failed,
+      result.summary.total,
+      JSON.stringify(result.expectations),
+      JSON.stringify(result.claims),
+      JSON.stringify(result.eval_feedback),
+      result.failure_feedback ? JSON.stringify(result.failure_feedback) : null,
+      JSON.stringify(result.execution_metrics),
+    );
+  });
+}
+
 export function writeImprovementSignalToDb(record: {
   timestamp: string;
   session_id: string;
@@ -377,7 +430,7 @@ export function updateSignalConsumed(
   signalType: string,
   runId: string,
 ): boolean {
-  return safeWrite("signal-consumed", (db) => {
+  const result = safeWriteResult("signal-consumed", (db) =>
     getStmt(
       db,
       "signal-consumed",
@@ -386,8 +439,9 @@ export function updateSignalConsumed(
       SET consumed = 1, consumed_at = ?, consumed_by_run = ?
       WHERE session_id = ? AND query = ? AND signal_type = ? AND consumed = 0
     `,
-    ).run(new Date().toISOString(), runId, sessionId, query, signalType);
-  });
+    ).run(new Date().toISOString(), runId, sessionId, query, signalType),
+  );
+  return result?.changes > 0;
 }
 
 // -- Internal insert helpers (used by cached statements) ----------------------
@@ -400,8 +454,8 @@ function insertSession(db: Database, s: CanonicalSessionRecord): void {
     INSERT INTO sessions
       (session_id, started_at, ended_at, platform, model, completion_status,
        source_session_kind, agent_cli, workspace_path, repo_remote, branch,
-       schema_version, normalized_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       schema_version, normalized_at, normalizer_version, capture_mode, raw_source_ref)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     ON CONFLICT(session_id) DO UPDATE SET
       platform = CASE
         WHEN sessions.platform IS NULL OR sessions.platform = 'unknown'
@@ -416,7 +470,10 @@ function insertSession(db: Database, s: CanonicalSessionRecord): void {
       agent_cli = COALESCE(sessions.agent_cli, excluded.agent_cli),
       repo_remote = COALESCE(sessions.repo_remote, excluded.repo_remote),
       branch = COALESCE(sessions.branch, excluded.branch),
-      workspace_path = COALESCE(sessions.workspace_path, excluded.workspace_path)
+      workspace_path = COALESCE(sessions.workspace_path, excluded.workspace_path),
+      normalizer_version = COALESCE(excluded.normalizer_version, sessions.normalizer_version),
+      capture_mode = COALESCE(excluded.capture_mode, sessions.capture_mode),
+      raw_source_ref = COALESCE(excluded.raw_source_ref, sessions.raw_source_ref)
   `,
   ).run(
     s.session_id,
@@ -432,6 +489,9 @@ function insertSession(db: Database, s: CanonicalSessionRecord): void {
     s.branch ?? null,
     s.schema_version,
     s.normalized_at,
+    s.normalizer_version ?? null,
+    s.capture_mode ?? null,
+    s.raw_source_ref ? JSON.stringify(s.raw_source_ref) : null,
   );
 }
 
@@ -441,8 +501,9 @@ function insertPrompt(db: Database, p: CanonicalPromptRecord): void {
     "prompt",
     `
     INSERT OR IGNORE INTO prompts
-      (prompt_id, session_id, occurred_at, prompt_kind, is_actionable, prompt_index, prompt_text)
-    VALUES (?, ?, ?, ?, ?, ?, ?)
+      (prompt_id, session_id, occurred_at, prompt_kind, is_actionable, prompt_index, prompt_text,
+       schema_version, platform, normalized_at, normalizer_version, capture_mode, raw_source_ref)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `,
   ).run(
     p.prompt_id,
@@ -452,6 +513,12 @@ function insertPrompt(db: Database, p: CanonicalPromptRecord): void {
     p.is_actionable ? 1 : 0,
     p.prompt_index ?? null,
     p.prompt_text,
+    p.schema_version ?? null,
+    p.platform ?? null,
+    p.normalized_at ?? null,
+    p.normalizer_version ?? null,
+    p.capture_mode ?? null,
+    p.raw_source_ref ? JSON.stringify(p.raw_source_ref) : null,
   );
 }
 
@@ -483,8 +550,9 @@ function insertSkillInvocation(
     INSERT OR IGNORE INTO skill_invocations
       (skill_invocation_id, session_id, occurred_at, skill_name, invocation_mode,
        triggered, confidence, tool_name, matched_prompt_id, agent_type,
-       query, skill_path, skill_scope, source)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       query, skill_path, skill_scope, source,
+       schema_version, platform, normalized_at, normalizer_version, capture_mode, raw_source_ref)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `,
   ).run(
     si.skill_invocation_id,
@@ -501,6 +569,12 @@ function insertSkillInvocation(
     ext.skill_path ?? null,
     ext.skill_scope ?? null,
     ext.source ?? null,
+    si.schema_version ?? null,
+    si.platform ?? null,
+    si.normalized_at ?? null,
+    ext.normalizer_version ?? null,
+    ext.capture_mode ?? null,
+    ext.raw_source_ref ? JSON.stringify(ext.raw_source_ref) : null,
   );
 }
 
@@ -512,8 +586,9 @@ function insertExecutionFact(db: Database, ef: CanonicalExecutionFactRecord): vo
     INSERT INTO execution_facts
       (session_id, occurred_at, prompt_id, tool_calls_json, total_tool_calls,
        assistant_turns, errors_encountered, input_tokens, output_tokens,
-       duration_ms, completion_status)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       duration_ms, completion_status,
+       schema_version, platform, normalized_at, normalizer_version, capture_mode, raw_source_ref)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `,
   ).run(
     ef.session_id,
@@ -527,5 +602,11 @@ function insertExecutionFact(db: Database, ef: CanonicalExecutionFactRecord): vo
     ef.output_tokens ?? null,
     ef.duration_ms ?? null,
     ef.completion_status ?? null,
+    ef.schema_version ?? null,
+    ef.platform ?? null,
+    ef.normalized_at ?? null,
+    ef.normalizer_version ?? null,
+    ef.capture_mode ?? null,
+    ef.raw_source_ref ? JSON.stringify(ef.raw_source_ref) : null,
   );
 }

package/cli/selftune/localdb/materialize.ts

@@ -14,6 +14,7 @@
 //   3. Backfill from batch ingestors that don't yet dual-write
 
 import type { Database } from "bun:sqlite";
+
 import {
   type CanonicalExecutionFactRecord,
   type CanonicalPromptRecord,
@@ -22,6 +23,7 @@ import {
   type CanonicalSkillInvocationRecord,
   isCanonicalRecord,
 } from "@selftune/telemetry-contract";
+
 import {
   CANONICAL_LOG,
   EVOLUTION_AUDIT_LOG,