tinker-agent 1.0.65 → 1.2.0

package/src/session/session-schema.ts

@@ -4,7 +4,7 @@ import type { SessionId } from "../ids/runtime-id";
 import { SessionError } from "./session-errors";
 
 export const SESSION_APPLICATION_ID = 0x544b5231;
-export const SESSION_SCHEMA_VERSION = 5;
+export const SESSION_SCHEMA_VERSION = 9;
 
 type SchemaDefinition = {
   type: "table" | "index" | "trigger" | "view";
@@ -27,7 +27,7 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
     name: "session_meta",
     sql: `CREATE TABLE session_meta (
       singleton INTEGER PRIMARY KEY CHECK (singleton = 1),
-      schema_version INTEGER NOT NULL CHECK (schema_version = 5),
+      schema_version INTEGER NOT NULL CHECK (schema_version = 9),
       schema_fingerprint TEXT NOT NULL,
       initialization_state TEXT NOT NULL CHECK (initialization_state IN ('creating', 'ready')),
       session_id TEXT NOT NULL UNIQUE,
@@ -37,10 +37,9 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
       project_instruction_file TEXT CHECK (project_instruction_file IS NULL OR project_instruction_file IN ('AGENTS.md', 'CLAUDE.md')),
       project_instruction_byte_length INTEGER CHECK (project_instruction_byte_length IS NULL OR project_instruction_byte_length >= 1),
       project_instruction_sha256 TEXT CHECK (project_instruction_sha256 IS NULL OR length(project_instruction_sha256) = 64),
-      tool_schema_sha256 TEXT,
-      runtime_contract_json TEXT,
-      runtime_contract_sha256 TEXT,
-      active_revision_id TEXT NOT NULL,
+      session_compatibility_json TEXT,
+      session_compatibility_sha256 TEXT,
+      active_revision_id TEXT,
       next_turn_number INTEGER NOT NULL CHECK (next_turn_number >= 1),
       next_event_sequence INTEGER NOT NULL CHECK (next_event_sequence >= 1),
       open_count INTEGER NOT NULL CHECK (open_count >= 1),
@@ -51,10 +50,13 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
       last_close_reason TEXT CHECK (last_close_reason IS NULL OR last_close_reason IN (
         'oneshot_complete', 'tui_exit', 'session_switch', 'runner_failed', 'initialization_failed'
       )),
-      CHECK ((runtime_contract_json IS NULL) = (runtime_contract_sha256 IS NULL)),
+      CHECK ((session_compatibility_json IS NULL) = (session_compatibility_sha256 IS NULL)),
       CHECK ((project_instruction_file IS NULL) = (project_instruction_byte_length IS NULL)),
       CHECK ((project_instruction_file IS NULL) = (project_instruction_sha256 IS NULL)),
-      CHECK ((initialization_state = 'creating') OR runtime_contract_json IS NOT NULL)
+      CHECK (
+        (initialization_state = 'creating' AND session_compatibility_json IS NULL AND active_revision_id IS NULL) OR
+        (initialization_state = 'ready' AND session_compatibility_json IS NOT NULL AND active_revision_id IS NOT NULL)
+      )
     ) STRICT`,
   },
   {
@@ -188,13 +190,72 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
       CHECK (raw_json IS NULL OR json_valid(raw_json)),
       CHECK (
         (completion_kind = 'returned' AND raw_json IS NOT NULL AND raw_sha256 IS NOT NULL AND
-          observation_format = 'tool-observation-v2' AND synthetic_reason IS NULL AND synthetic_detail IS NULL) OR
+          observation_format IS NOT NULL AND length(observation_format) > 0 AND synthetic_reason IS NULL AND synthetic_detail IS NULL) OR
         (completion_kind = 'synthetic' AND raw_json IS NULL AND raw_sha256 IS NULL AND
           observation_format IS NULL AND synthetic_reason IS NOT NULL)
       ),
       CHECK ((synthetic_reason = 'failed_active') = (synthetic_detail IS NOT NULL))
     ) STRICT`,
   },
+  {
+    type: "table",
+    name: "image_assets",
+    sql: `CREATE TABLE image_assets (
+      asset_id TEXT PRIMARY KEY
+        CHECK (length(asset_id) = 64 AND asset_id NOT GLOB '*[^0-9a-f]*'),
+      mime_type TEXT NOT NULL
+        CHECK (mime_type IN ('image/png', 'image/jpeg', 'image/webp')),
+      byte_length INTEGER NOT NULL CHECK (byte_length > 0),
+      width INTEGER NOT NULL CHECK (width > 0),
+      height INTEGER NOT NULL CHECK (height > 0),
+      created_at TEXT NOT NULL
+    ) STRICT`,
+  },
+  {
+    type: "table",
+    name: "message_image_attachments",
+    sql: `CREATE TABLE message_image_attachments (
+      message_id TEXT NOT NULL,
+      attachment_id TEXT NOT NULL CHECK (length(attachment_id) = 36),
+      asset_id TEXT NOT NULL,
+      position INTEGER NOT NULL CHECK (position >= 0),
+      label TEXT NOT NULL CHECK (length(label) > 0),
+      range_start INTEGER NOT NULL CHECK (range_start >= 0),
+      range_end INTEGER NOT NULL CHECK (range_end > range_start),
+      original_name TEXT NOT NULL CHECK (length(original_name) > 0),
+      PRIMARY KEY (message_id, attachment_id),
+      UNIQUE (message_id, position),
+      UNIQUE (message_id, label),
+      UNIQUE (message_id, range_start, range_end),
+      FOREIGN KEY (message_id) REFERENCES messages(message_id),
+      FOREIGN KEY (asset_id) REFERENCES image_assets(asset_id)
+    ) STRICT`,
+  },
+  {
+    type: "table",
+    name: "context_surfaces",
+    sql: `CREATE TABLE context_surfaces (
+      surface_id TEXT PRIMARY KEY,
+      session_id TEXT NOT NULL,
+      system_prompt TEXT NOT NULL CHECK (length(system_prompt) > 0),
+      system_prompt_sha256 TEXT NOT NULL CHECK (length(system_prompt_sha256) = 64),
+      recall_contract_version TEXT NOT NULL CHECK (length(recall_contract_version) BETWEEN 1 AND 64),
+      project_instruction_json TEXT CHECK (project_instruction_json IS NULL OR json_valid(project_instruction_json)),
+      skill_catalog_json TEXT NOT NULL CHECK (json_valid(skill_catalog_json)),
+      skill_catalog_sha256 TEXT NOT NULL CHECK (length(skill_catalog_sha256) = 64),
+      active_skills_json TEXT NOT NULL CHECK (json_valid(active_skills_json)),
+      active_skills_sha256 TEXT NOT NULL CHECK (length(active_skills_sha256) = 64),
+      tool_definitions_json TEXT NOT NULL CHECK (json_valid(tool_definitions_json)),
+      tool_definitions_sha256 TEXT NOT NULL CHECK (length(tool_definitions_sha256) = 64),
+      tool_schema_sha256 TEXT NOT NULL CHECK (length(tool_schema_sha256) = 64),
+      request_config_sha256 TEXT NOT NULL CHECK (length(request_config_sha256) = 64),
+      request_max_output_tokens INTEGER NOT NULL CHECK (request_max_output_tokens >= 1),
+      surface_sha256 TEXT NOT NULL CHECK (length(surface_sha256) = 64),
+      created_at TEXT NOT NULL,
+      UNIQUE (session_id, surface_id),
+      FOREIGN KEY (session_id) REFERENCES session_meta(session_id)
+    ) STRICT`,
+  },
   {
     type: "table",
     name: "context_revisions",
@@ -203,30 +264,63 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
       session_id TEXT NOT NULL,
       revision_number INTEGER NOT NULL CHECK (revision_number >= 1),
       parent_revision_id TEXT,
-      kind TEXT NOT NULL CHECK (kind IN ('initial_full', 'swap_only')),
-      keep_from_ordinal INTEGER NOT NULL CHECK (keep_from_ordinal = 1),
+      kind TEXT NOT NULL CHECK (kind IN ('initial_full', 'swap_only', 'surface_refresh', 'prefix_retirement', 'skills_update')),
+      surface_id TEXT NOT NULL,
+      surface_sha256 TEXT NOT NULL CHECK (length(surface_sha256) = 64),
+      keep_from_ordinal INTEGER NOT NULL CHECK (keep_from_ordinal >= 1),
       source_through_ordinal INTEGER NOT NULL CHECK (source_through_ordinal >= 1),
       added_override_count INTEGER NOT NULL CHECK (added_override_count >= 0),
-      total_override_count INTEGER NOT NULL CHECK (total_override_count >= 0),
-      override_manifest_sha256 TEXT NOT NULL CHECK (length(override_manifest_sha256) = 64),
+      active_override_count INTEGER NOT NULL CHECK (active_override_count >= 0),
+      active_override_manifest_sha256 TEXT NOT NULL CHECK (length(active_override_manifest_sha256) = 64),
       canonical_sequence_sha256 TEXT NOT NULL CHECK (length(canonical_sequence_sha256) = 64),
       rendered_message_sha256 TEXT NOT NULL CHECK (length(rendered_message_sha256) = 64),
       policy_version TEXT,
       renderer_format TEXT,
       plan_sha256 TEXT CHECK (plan_sha256 IS NULL OR length(plan_sha256) = 64),
+      change_manifest_sha256 TEXT CHECK (change_manifest_sha256 IS NULL OR length(change_manifest_sha256) = 64),
+      activation_manifest_sha256 TEXT CHECK (activation_manifest_sha256 IS NULL OR length(activation_manifest_sha256) = 64),
+      retired_through_ordinal INTEGER CHECK (retired_through_ordinal IS NULL OR retired_through_ordinal >= 2),
+      retired_turn_count INTEGER CHECK (retired_turn_count IS NULL OR retired_turn_count >= 1),
+      retired_frame_count INTEGER CHECK (retired_frame_count IS NULL OR retired_frame_count >= 1),
+      retired_message_count INTEGER CHECK (retired_message_count IS NULL OR retired_message_count >= 1),
       created_at TEXT NOT NULL,
       UNIQUE (session_id, revision_number),
       FOREIGN KEY (session_id) REFERENCES session_meta(session_id),
       FOREIGN KEY (parent_revision_id) REFERENCES context_revisions(revision_id),
+      FOREIGN KEY (session_id, surface_id) REFERENCES context_surfaces(session_id, surface_id),
       CHECK (
         (kind = 'initial_full' AND revision_number = 1 AND parent_revision_id IS NULL AND
           source_through_ordinal = 1 AND added_override_count = 0 AND
-          total_override_count = 0 AND policy_version IS NULL AND
-          renderer_format IS NULL AND plan_sha256 IS NULL) OR
+          active_override_count = 0 AND policy_version IS NULL AND
+          renderer_format IS NULL AND plan_sha256 IS NULL AND change_manifest_sha256 IS NULL AND activation_manifest_sha256 IS NULL AND
+          retired_through_ordinal IS NULL AND retired_turn_count IS NULL AND
+          retired_frame_count IS NULL AND retired_message_count IS NULL) OR
         (kind = 'swap_only' AND revision_number >= 2 AND parent_revision_id IS NOT NULL AND
-          added_override_count >= 1 AND total_override_count >= added_override_count AND
+          added_override_count >= 1 AND active_override_count >= added_override_count AND
           policy_version = 'swap-only-v1' AND
-          renderer_format = 'swap-observation-v1' AND plan_sha256 IS NOT NULL)
+          renderer_format = 'swap-observation-v1' AND plan_sha256 IS NOT NULL AND
+          change_manifest_sha256 IS NULL AND activation_manifest_sha256 IS NULL AND retired_through_ordinal IS NULL AND
+          retired_turn_count IS NULL AND retired_frame_count IS NULL AND
+          retired_message_count IS NULL) OR
+        (kind = 'surface_refresh' AND revision_number >= 2 AND parent_revision_id IS NOT NULL AND
+          added_override_count = 0 AND policy_version IS NULL AND renderer_format IS NULL AND
+          plan_sha256 IS NULL AND change_manifest_sha256 IS NOT NULL AND activation_manifest_sha256 IS NULL AND
+          retired_through_ordinal IS NULL AND retired_turn_count IS NULL AND
+          retired_frame_count IS NULL AND retired_message_count IS NULL) OR
+        (kind = 'prefix_retirement' AND revision_number >= 2 AND parent_revision_id IS NOT NULL AND
+          keep_from_ordinal > 1 AND retired_through_ordinal = keep_from_ordinal - 1 AND
+          added_override_count = 0 AND policy_version = 'recall-first-retirement-v1' AND
+          renderer_format IS NULL AND plan_sha256 IS NOT NULL AND
+          change_manifest_sha256 IS NULL AND activation_manifest_sha256 IS NULL AND retired_turn_count >= 1 AND
+          retired_frame_count >= 1 AND retired_message_count >= 1)
+        OR
+        (kind = 'skills_update' AND revision_number >= 2 AND parent_revision_id IS NOT NULL AND
+          added_override_count >= 1 AND active_override_count >= added_override_count AND
+          policy_version = 'agent-skills-v1' AND
+          renderer_format = 'skill-activation-receipt-v1' AND plan_sha256 IS NULL AND
+          change_manifest_sha256 IS NOT NULL AND activation_manifest_sha256 IS NOT NULL AND
+          retired_through_ordinal IS NULL AND retired_turn_count IS NULL AND
+          retired_frame_count IS NULL AND retired_message_count IS NULL)
       )
     ) STRICT`,
   },
@@ -240,14 +334,14 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
       frame_id TEXT NOT NULL,
       ordinal INTEGER NOT NULL CHECK (ordinal >= 1),
       representation TEXT NOT NULL CHECK (representation = 'swapped'),
-      renderer_format TEXT NOT NULL CHECK (renderer_format = 'swap-observation-v1'),
+      renderer_format TEXT NOT NULL CHECK (renderer_format IN ('swap-observation-v1', 'skill-activation-receipt-v1')),
       source TEXT NOT NULL,
       original_content_sha256 TEXT NOT NULL CHECK (length(original_content_sha256) = 64),
       rendered_content TEXT NOT NULL CHECK (length(rendered_content) > 0),
       rendered_content_sha256 TEXT NOT NULL CHECK (length(rendered_content_sha256) = 64),
       original_bytes INTEGER NOT NULL CHECK (original_bytes > 0),
       rendered_bytes INTEGER NOT NULL CHECK (rendered_bytes > 0),
-      byte_savings INTEGER NOT NULL CHECK (byte_savings > 0),
+      byte_savings INTEGER NOT NULL,
       created_at TEXT NOT NULL,
       PRIMARY KEY (introduced_revision_id, message_id),
       UNIQUE (session_id, message_id),
@@ -256,7 +350,32 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
       FOREIGN KEY (session_id) REFERENCES session_meta(session_id),
       FOREIGN KEY (message_id) REFERENCES messages(message_id),
       FOREIGN KEY (frame_id) REFERENCES protocol_frames(frame_id),
-      CHECK (original_bytes = rendered_bytes + byte_savings)
+      CHECK (original_bytes = rendered_bytes + byte_savings),
+      CHECK (renderer_format <> 'swap-observation-v1' OR byte_savings > 0)
+    ) STRICT`,
+  },
+  {
+    type: "table",
+    name: "skill_activations",
+    sql: `CREATE TABLE skill_activations (
+      activation_message_id TEXT PRIMARY KEY REFERENCES messages(message_id),
+      tool_call_id TEXT NOT NULL UNIQUE REFERENCES tool_results(tool_call_id),
+      session_id TEXT NOT NULL REFERENCES session_meta(session_id),
+      name TEXT NOT NULL,
+      scope TEXT NOT NULL CHECK (scope IN ('project', 'user')),
+      skill_file_sha256 TEXT NOT NULL CHECK (length(skill_file_sha256) = 64),
+      state TEXT NOT NULL CHECK (state IN ('pending', 'dispatched', 'promoted', 'rejected')),
+      dispatched_iteration_id TEXT REFERENCES iterations(iteration_id),
+      settled_revision_id TEXT REFERENCES context_revisions(revision_id),
+      rejection_reason TEXT,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      CHECK (
+        (state = 'pending' AND dispatched_iteration_id IS NULL AND settled_revision_id IS NULL AND rejection_reason IS NULL) OR
+        (state = 'dispatched' AND dispatched_iteration_id IS NOT NULL AND settled_revision_id IS NULL AND rejection_reason IS NULL) OR
+        (state = 'promoted' AND dispatched_iteration_id IS NOT NULL AND settled_revision_id IS NOT NULL AND rejection_reason IS NULL) OR
+        (state = 'rejected' AND settled_revision_id IS NOT NULL AND rejection_reason IS NOT NULL)
+      )
     ) STRICT`,
   },
   {
@@ -289,6 +408,11 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
     name: "idx_context_overrides_revision_ordinal",
     sql: "CREATE INDEX idx_context_overrides_revision_ordinal ON context_overrides(introduced_revision_id, ordinal)",
   },
+  {
+    type: "index",
+    name: "idx_skill_activations_session_state",
+    sql: "CREATE INDEX idx_skill_activations_session_state ON skill_activations(session_id, state, activation_message_id)",
+  },
   {
     type: "index",
     name: "idx_frames_session_ordinal",
@@ -299,6 +423,11 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
     name: "idx_messages_frame_ordinal",
     sql: "CREATE INDEX idx_messages_frame_ordinal ON messages(frame_id, ordinal)",
   },
+  {
+    type: "index",
+    name: "idx_message_image_attachments_asset",
+    sql: "CREATE INDEX idx_message_image_attachments_asset ON message_image_attachments(asset_id)",
+  },
   {
     type: "index",
     name: "idx_turns_session_recent",
@@ -341,8 +470,64 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
   },
   ...immutableTriggers("messages"),
   ...immutableTriggers("tool_results"),
+  ...immutableTriggers("image_assets"),
+  ...immutableTriggers("message_image_attachments"),
+  ...immutableTriggers("context_surfaces"),
   ...immutableTriggers("context_revisions"),
   ...immutableTriggers("context_overrides"),
+  {
+    type: "trigger",
+    name: "skill_activations_no_delete",
+    sql: `CREATE TRIGGER skill_activations_no_delete BEFORE DELETE ON skill_activations
+      BEGIN SELECT RAISE(ABORT, 'skill_activations cannot be deleted'); END`,
+  },
+  {
+    type: "trigger",
+    name: "skill_activations_validate_insert",
+    sql: `CREATE TRIGGER skill_activations_validate_insert BEFORE INSERT ON skill_activations
+      WHEN NOT (
+        NEW.session_id = (SELECT session_id FROM session_meta WHERE singleton = 1) AND
+        NEW.state = 'pending' AND NEW.dispatched_iteration_id IS NULL AND
+        NEW.settled_revision_id IS NULL AND NEW.rejection_reason IS NULL AND
+        EXISTS (
+          SELECT 1 FROM messages m
+          JOIN tool_results tr ON tr.tool_message_id = m.message_id
+          WHERE m.message_id = NEW.activation_message_id
+            AND m.session_id = NEW.session_id AND m.tool_call_id = NEW.tool_call_id
+            AND m.name = 'Skill' AND m.role = 'tool' AND m.origin = 'tool'
+            AND tr.tool_call_id = NEW.tool_call_id AND tr.session_id = NEW.session_id
+            AND tr.completion_kind = 'returned'
+            AND json_extract(tr.raw_json, '$.kind') = 'skill'
+            AND json_extract(tr.raw_json, '$.ok') = 1
+            AND json_extract(tr.raw_json, '$.status') = 'loaded'
+            AND json_extract(tr.raw_json, '$.name') = NEW.name
+            AND json_extract(tr.raw_json, '$.scope') = NEW.scope
+            AND json_extract(tr.raw_json, '$.sha256') = NEW.skill_file_sha256
+        )
+      )
+      BEGIN SELECT RAISE(ABORT, 'invalid skill activation insert'); END`,
+  },
+  {
+    type: "trigger",
+    name: "skill_activations_monotonic_update",
+    sql: `CREATE TRIGGER skill_activations_monotonic_update BEFORE UPDATE ON skill_activations
+      WHEN NOT (
+        OLD.activation_message_id = NEW.activation_message_id AND
+        OLD.tool_call_id = NEW.tool_call_id AND OLD.session_id = NEW.session_id AND
+        OLD.name = NEW.name AND OLD.scope = NEW.scope AND
+        OLD.skill_file_sha256 = NEW.skill_file_sha256 AND OLD.created_at = NEW.created_at AND
+        ((OLD.state = 'pending' AND NEW.state = 'dispatched' AND
+          NEW.dispatched_iteration_id IS NOT NULL AND NEW.settled_revision_id IS NULL AND NEW.rejection_reason IS NULL) OR
+         (OLD.state = 'pending' AND NEW.state = 'rejected' AND
+          NEW.dispatched_iteration_id IS NULL AND NEW.settled_revision_id IS NOT NULL AND NEW.rejection_reason IS NOT NULL) OR
+         (OLD.state = 'dispatched' AND NEW.state IN ('promoted', 'rejected') AND
+          NEW.dispatched_iteration_id = OLD.dispatched_iteration_id AND
+          NEW.settled_revision_id IS NOT NULL AND
+          ((NEW.state = 'promoted' AND NEW.rejection_reason IS NULL) OR
+           (NEW.state = 'rejected' AND NEW.rejection_reason IS NOT NULL))))
+      )
+      BEGIN SELECT RAISE(ABORT, 'invalid skill activation transition'); END`,
+  },
   {
     type: "trigger",
     name: "context_revisions_validate_insert",
@@ -350,16 +535,85 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
       BEFORE INSERT ON context_revisions
       WHEN NOT (
         NEW.session_id = (SELECT session_id FROM session_meta WHERE singleton = 1) AND
-        ((NEW.kind = 'initial_full' AND
-          NEW.revision_id = (SELECT active_revision_id FROM session_meta WHERE singleton = 1) AND
-          NOT EXISTS (SELECT 1 FROM context_revisions WHERE session_id = NEW.session_id)) OR
+        ((NEW.kind = 'initial_full' AND NEW.revision_number = 1 AND
+          (SELECT initialization_state FROM session_meta WHERE singleton = 1) = 'creating' AND
+          (SELECT active_revision_id FROM session_meta WHERE singleton = 1) IS NULL AND
+          NOT EXISTS (SELECT 1 FROM context_revisions WHERE session_id = NEW.session_id) AND
+          NEW.surface_sha256 = (SELECT surface_sha256 FROM context_surfaces WHERE surface_id = NEW.surface_id)) OR
          (NEW.kind = 'swap_only' AND
           NEW.parent_revision_id = (SELECT active_revision_id FROM session_meta WHERE singleton = 1) AND
           NEW.revision_number = 1 + COALESCE((
             SELECT revision_number FROM context_revisions
             WHERE revision_id = NEW.parent_revision_id AND session_id = NEW.session_id
           ), 0) AND
-          NEW.source_through_ordinal = COALESCE((SELECT MAX(ordinal) FROM messages), 0)))
+          NEW.source_through_ordinal = COALESCE((SELECT MAX(ordinal) FROM messages), 0) AND
+          EXISTS (SELECT 1 FROM protocol_frames WHERE state = 'closed' AND last_ordinal = NEW.source_through_ordinal) AND
+          NEW.surface_id = (SELECT surface_id FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.surface_sha256 = (SELECT surface_sha256 FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.keep_from_ordinal = (SELECT keep_from_ordinal FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.active_override_count = (SELECT active_override_count FROM context_revisions WHERE revision_id = NEW.parent_revision_id) + NEW.added_override_count) OR
+         (NEW.kind = 'surface_refresh' AND
+          NEW.parent_revision_id = (SELECT active_revision_id FROM session_meta WHERE singleton = 1) AND
+          NEW.revision_number = 1 + COALESCE((
+            SELECT revision_number FROM context_revisions
+            WHERE revision_id = NEW.parent_revision_id AND session_id = NEW.session_id
+          ), 0) AND
+          NEW.source_through_ordinal = COALESCE((SELECT MAX(ordinal) FROM messages), 0) AND
+          EXISTS (SELECT 1 FROM protocol_frames WHERE state = 'closed' AND last_ordinal = NEW.source_through_ordinal) AND
+          NEW.surface_id <> (SELECT surface_id FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.surface_sha256 = (SELECT surface_sha256 FROM context_surfaces WHERE surface_id = NEW.surface_id) AND
+          NEW.keep_from_ordinal = (SELECT keep_from_ordinal FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.active_override_count = (SELECT active_override_count FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.active_override_manifest_sha256 = (SELECT active_override_manifest_sha256 FROM context_revisions WHERE revision_id = NEW.parent_revision_id)) OR
+         (NEW.kind = 'skills_update' AND
+          NEW.parent_revision_id = (SELECT active_revision_id FROM session_meta WHERE singleton = 1) AND
+          NEW.revision_number = 1 + COALESCE((
+            SELECT revision_number FROM context_revisions
+            WHERE revision_id = NEW.parent_revision_id AND session_id = NEW.session_id
+          ), 0) AND
+          NEW.source_through_ordinal = COALESCE((SELECT MAX(ordinal) FROM messages), 0) AND
+          EXISTS (SELECT 1 FROM protocol_frames WHERE state = 'closed' AND last_ordinal = NEW.source_through_ordinal) AND
+          NEW.surface_sha256 = (SELECT surface_sha256 FROM context_surfaces WHERE surface_id = NEW.surface_id) AND
+          NEW.keep_from_ordinal = (SELECT keep_from_ordinal FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.active_override_count = (SELECT active_override_count FROM context_revisions WHERE revision_id = NEW.parent_revision_id) + NEW.added_override_count) OR
+         (NEW.kind = 'prefix_retirement' AND
+          NEW.parent_revision_id = (SELECT active_revision_id FROM session_meta WHERE singleton = 1) AND
+          NEW.revision_number = 1 + COALESCE((
+            SELECT revision_number FROM context_revisions
+            WHERE revision_id = NEW.parent_revision_id AND session_id = NEW.session_id
+          ), 0) AND
+          NEW.source_through_ordinal = COALESCE((SELECT MAX(ordinal) FROM messages), 0) AND
+          EXISTS (SELECT 1 FROM protocol_frames WHERE state = 'closed' AND last_ordinal = NEW.source_through_ordinal) AND
+          NEW.surface_id = (SELECT surface_id FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.surface_sha256 = (SELECT surface_sha256 FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          NEW.keep_from_ordinal > (SELECT keep_from_ordinal FROM context_revisions WHERE revision_id = NEW.parent_revision_id) AND
+          EXISTS (
+            SELECT 1 FROM messages m
+            JOIN protocol_frames pf ON pf.frame_id = m.frame_id
+            JOIN turns t ON t.turn_id = m.turn_id
+            WHERE m.ordinal = NEW.keep_from_ordinal AND m.role = 'user'
+              AND pf.kind = 'user' AND pf.state = 'closed'
+              AND pf.first_ordinal = NEW.keep_from_ordinal
+              AND pf.last_ordinal = NEW.keep_from_ordinal
+              AND t.status <> 'open'
+          ) AND
+          EXISTS (
+            SELECT 1 FROM messages m
+            JOIN protocol_frames pf ON pf.frame_id = m.frame_id
+            JOIN turns t ON t.turn_id = m.turn_id
+            WHERE m.ordinal = NEW.keep_from_ordinal - 1
+              AND pf.state = 'closed' AND pf.last_ordinal = NEW.keep_from_ordinal - 1
+              AND t.status <> 'open'
+          ) AND
+          NEW.active_override_count = (
+            SELECT COUNT(*) FROM context_overrides co
+            JOIN context_revisions introduced
+              ON introduced.revision_id = co.introduced_revision_id
+            JOIN context_revisions parent
+              ON parent.revision_id = NEW.parent_revision_id
+            WHERE introduced.revision_number <= parent.revision_number
+              AND co.ordinal >= NEW.keep_from_ordinal
+          )))
       )
       BEGIN SELECT RAISE(ABORT, 'invalid context revision insert'); END`,
   },
@@ -373,7 +627,9 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
           SELECT 1 FROM context_revisions cr
           WHERE cr.revision_id = NEW.introduced_revision_id
             AND cr.session_id = NEW.session_id
-            AND cr.kind = 'swap_only'
+            AND ((cr.kind = 'swap_only' AND NEW.renderer_format = 'swap-observation-v1') OR
+                 (cr.kind = 'skills_update' AND NEW.renderer_format = 'skill-activation-receipt-v1'))
+            AND NEW.ordinal >= cr.keep_from_ordinal
             AND NEW.ordinal <= cr.source_through_ordinal
         ) AND
         EXISTS (
@@ -394,10 +650,15 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
             AND tr.session_id = NEW.session_id
             AND tr.frame_id = NEW.frame_id
             AND tr.observation_sha256 = NEW.original_content_sha256
+            AND (NEW.renderer_format <> 'skill-activation-receipt-v1' OR
+                 (m.name = 'Skill' AND tr.completion_kind = 'returned' AND
+                  json_extract(tr.raw_json, '$.kind') = 'skill' AND
+                  json_extract(tr.raw_json, '$.ok') = 1 AND
+                  json_extract(tr.raw_json, '$.status') = 'loaded'))
         ) AND
         NEW.source = 'ctx://message/' || NEW.message_id AND
         length(CAST(NEW.rendered_content AS BLOB)) = NEW.rendered_bytes AND
-        NEW.rendered_bytes < NEW.original_bytes
+        (NEW.renderer_format <> 'swap-observation-v1' OR NEW.rendered_bytes < NEW.original_bytes)
       )
       BEGIN SELECT RAISE(ABORT, 'invalid context override insert'); END`,
   },
@@ -519,10 +780,16 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
         NEW.open_count >= OLD.open_count AND
         ((OLD.initialization_state = 'creating' AND NEW.initialization_state IN ('creating', 'ready')) OR
          (OLD.initialization_state = 'ready' AND NEW.initialization_state = 'ready')) AND
-        (OLD.tool_schema_sha256 IS NULL OR NEW.tool_schema_sha256 = OLD.tool_schema_sha256) AND
-        (OLD.runtime_contract_json IS NULL OR NEW.runtime_contract_json = OLD.runtime_contract_json) AND
-        (OLD.runtime_contract_sha256 IS NULL OR NEW.runtime_contract_sha256 = OLD.runtime_contract_sha256) AND
-        (OLD.active_revision_id = NEW.active_revision_id OR EXISTS (
+        (OLD.session_compatibility_json IS NULL OR NEW.session_compatibility_json = OLD.session_compatibility_json) AND
+        (OLD.session_compatibility_sha256 IS NULL OR NEW.session_compatibility_sha256 = OLD.session_compatibility_sha256) AND
+        ((OLD.active_revision_id IS NULL AND NEW.active_revision_id IS NOT NULL AND
+          OLD.initialization_state = 'creating' AND NEW.initialization_state = 'ready' AND
+          EXISTS (
+            SELECT 1 FROM context_revisions initial
+            WHERE initial.revision_id = NEW.active_revision_id
+              AND initial.session_id = OLD.session_id
+              AND initial.kind = 'initial_full'
+          )) OR OLD.active_revision_id = NEW.active_revision_id OR EXISTS (
           SELECT 1
           FROM context_revisions previous
           JOIN context_revisions next
@@ -532,12 +799,36 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
           WHERE previous.revision_id = OLD.active_revision_id
             AND next.revision_id = NEW.active_revision_id
             AND next.session_id = OLD.session_id
-            AND next.kind = 'swap_only'
+            AND next.kind IN ('swap_only', 'surface_refresh', 'prefix_retirement', 'skills_update')
             AND next.added_override_count = (
               SELECT COUNT(*) FROM context_overrides
               WHERE introduced_revision_id = next.revision_id
             )
-            AND next.total_override_count = previous.total_override_count + next.added_override_count
+            AND ((next.kind = 'swap_only' AND
+                  next.keep_from_ordinal = previous.keep_from_ordinal AND
+                  next.active_override_count = previous.active_override_count + next.added_override_count AND
+                  next.surface_id = previous.surface_id) OR
+                 (next.kind = 'surface_refresh' AND
+                  next.keep_from_ordinal = previous.keep_from_ordinal AND
+                  next.active_override_count = previous.active_override_count AND
+                  next.added_override_count = 0 AND
+                  next.active_override_manifest_sha256 = previous.active_override_manifest_sha256 AND
+                  next.surface_id <> previous.surface_id) OR
+                 (next.kind = 'skills_update' AND
+                  next.keep_from_ordinal = previous.keep_from_ordinal AND
+                  next.active_override_count = previous.active_override_count + next.added_override_count AND
+                  next.surface_sha256 = (SELECT surface_sha256 FROM context_surfaces WHERE surface_id = next.surface_id)) OR
+                 (next.kind = 'prefix_retirement' AND
+                  next.keep_from_ordinal > previous.keep_from_ordinal AND
+                  next.added_override_count = 0 AND
+                  next.surface_id = previous.surface_id AND
+                  next.active_override_count = (
+                    SELECT COUNT(*) FROM context_overrides co
+                    JOIN context_revisions introduced
+                      ON introduced.revision_id = co.introduced_revision_id
+                    WHERE introduced.revision_number <= previous.revision_number
+                      AND co.ordinal >= next.keep_from_ordinal
+                  )))
             AND NOT EXISTS (SELECT 1 FROM context_measurement_state)
         ))
       )
@@ -545,7 +836,7 @@ const schemaDefinitions: readonly SchemaDefinition[] = [
   },
 ];
 
-export const SESSION_SCHEMA_V5_FINGERPRINT = sha256(
+export const SESSION_SCHEMA_V9_FINGERPRINT = sha256(
   stableJsonStringify({
     definitions: schemaDefinitions.map((definition) => ({
       type: definition.type,
@@ -575,7 +866,30 @@ export function createSessionSchema(database: Database): void {
   database.exec(`PRAGMA application_id = ${SESSION_APPLICATION_ID}`);
   database.exec(`PRAGMA user_version = ${SESSION_SCHEMA_VERSION}`);
   for (const definition of schemaDefinitions) {
-    database.exec(definition.sql);
+    try {
+      database.exec(definition.sql);
+    } catch (error) {
+      throw new Error(
+        `Failed to create session schema ${definition.type} ${definition.name}.`,
+        { cause: error },
+      );
+    }
+  }
+}
+
+export function dropSessionCloneTriggers(database: Database): void {
+  for (const definition of schemaDefinitions) {
+    if (definition.type === "trigger") {
+      database.exec(`DROP TRIGGER ${definition.name}`);
+    }
+  }
+}
+
+export function reinstallSessionCloneTriggers(database: Database): void {
+  for (const definition of schemaDefinitions) {
+    if (definition.type === "trigger") {
+      database.exec(definition.sql);
+    }
   }
 }
 
@@ -648,7 +962,7 @@ export function verifySessionSchema(database: Database, sessionId?: SessionId):
     throw new SessionError(
       "SESSION_SCHEMA_INVALID",
       "verify_schema",
-      "Session FTS configuration does not match schema v5.",
+      "Session FTS configuration does not match schema v9.",
       { sessionId },
     );
   }