@fadhilp/stateql 0.5.2 → 0.5.3

package/dist/src/migrations.js

@@ -46,6 +46,15 @@ const MIGRATIONS = [
         apply: migrateSharedSessionActors,
         validate: validateSharedSessionActors,
     },
+    {
+        name: "history_sql_v1",
+        apply(db) {
+            addColumn(db, "history", "sql", "TEXT");
+        },
+        validate(db) {
+            requireColumns(db, "history", ["sql"]);
+        },
+    },
 ];
 export function runMigrations(db, now) {
     db.exec(`
@@ -202,6 +211,7 @@ function createInitialSchema(db) {
       session_id TEXT NOT NULL,
       actor_id TEXT NOT NULL,
       command TEXT NOT NULL,
+      sql TEXT,
       handle TEXT,
       executed INTEGER NOT NULL,
       cached INTEGER NOT NULL,

package/dist/src/stateql.js

@@ -613,7 +613,7 @@ export class StateQL {
             finally {
                 await closeAdapterQuietly(adapter);
             }
-        });
+        }, sql);
     }
     async show(idOrAlias) {
         return this.withResult("show", idOrAlias, async (result) => ({
@@ -756,7 +756,7 @@ export class StateQL {
         return this.run("exec", async (session) => {
             const connection = this.requireConnection(session);
             return this.performExec(session, connection, sql, options, this.executionContext(options));
-        });
+        }, sql);
     }
     async receipt(id) {
         return this.run("receipt", async (session) => {
@@ -1023,9 +1023,10 @@ export class StateQL {
             finally {
                 await closeAdapterQuietly(adapter);
             }
-        });
+        }, sql);
     }
     async apply(planId, options = {}) {
+        let historySql;
         return this.run("apply", async (session) => {
             this.rejectDuringStagedTransaction(session, "Plans");
             const plan = this.store.getPlan(planId);
@@ -1043,6 +1044,7 @@ export class StateQL {
             if (Date.parse(plan.expires_at) <= this.now().getTime()) {
                 throw new StateQLError("STALE_PLAN", "Plan has expired.");
             }
+            historySql = plan.sql;
             const planParameters = parseJson(plan.parameters, `plan "${plan.id}" parameters`, isSqlParameters);
             const claimToken = this.store.nextId("claim");
             const claimed = this.store.claimPlan(plan.id, session.id, this.actorId, claimToken);
@@ -1096,7 +1098,7 @@ export class StateQL {
                 if (!retainClaim)
                     this.store.releasePlanClaim(plan.id, claimToken);
             }
-        });
+        }, () => historySql);
     }
     async history(limit = 20) {
         return this.run("history", async (session) => ({
@@ -1642,7 +1644,7 @@ export class StateQL {
             result.state_version === stateVersion &&
             result.state_signature === stateSignature);
     }
-    async run(command, action) {
+    async run(command, action, historySql) {
         const started = performance.now();
         let session = this.store.ensureSession(this.sessionName);
         const commandId = this.store.nextId("cmd");
@@ -1661,12 +1663,14 @@ export class StateQL {
         try {
             const result = await action(session);
             const responseSession = result.session ?? session;
+            const sqlText = resolveHistorySql(historySql);
             this.store.addHistory({
                 id: commandId,
                 sessionId: session.id,
                 actorId: this.actorId,
                 command,
                 ...(result.handle ? { handle: result.handle } : {}),
+                ...(sqlText !== undefined ? { sql: sqlText } : {}),
                 executed: result.executed ?? false,
                 cached: result.cached ?? false,
                 success: true,
@@ -1690,11 +1694,13 @@ export class StateQL {
         }
         catch (error) {
             const stateqlError = asStateQLError(error);
+            const sqlText = resolveHistorySql(historySql);
             this.store.addHistory({
                 id: commandId,
                 sessionId: session.id,
                 actorId: this.actorId,
                 command,
+                ...(sqlText !== undefined ? { sql: sqlText } : {}),
                 executed: stateqlError.details.executed,
                 cached: false,
                 success: false,
@@ -1712,6 +1718,9 @@ export class StateQL {
         }
     }
 }
+function resolveHistorySql(sql) {
+    return typeof sql === "function" ? sql() : sql;
+}
 function historyEntry(item) {
     return {
         command_id: item.id,
@@ -1719,6 +1728,7 @@ function historyEntry(item) {
         session_id: item.session_id,
         actor_id: item.actor_id,
         command: item.command,
+        sql: item.sql,
         handle: item.handle,
         executed: Boolean(item.executed),
         cached: Boolean(item.cached),

package/dist/src/store.d.ts

@@ -98,6 +98,7 @@ export interface HistoryRecord {
     session_id: string;
     actor_id: string;
     command: string;
+    sql: string | null;
     handle: string | null;
     executed: number;
     cached: number;
@@ -267,6 +268,7 @@ export declare class StateStore {
         sessionId: string;
         actorId: string;
         command: string;
+        sql?: string;
         handle?: string;
         executed: boolean;
         cached: boolean;

package/dist/src/store.js

@@ -6,6 +6,7 @@ import { runMigrations } from "./migrations.js";
 import { StateQLError } from "./errors.js";
 import { isColumns, isRows, isSqlParameters, parseJson, toJsonSafe, } from "./util.js";
 const HISTORY_LIMIT_PER_SESSION = 10_000;
+const MAX_HISTORY_SQL_BYTES = 4_096;
 const DEFAULT_MAX_STATE_BYTES = 256 * 1024 * 1024;
 export class StateStore {
     now;
@@ -791,10 +792,10 @@ export class StateStore {
         const id = input.id ?? this.nextId("cmd");
         this.db
             .prepare(`INSERT INTO history
-          (id, timestamp, session_id, actor_id, command, handle, executed,
+          (id, timestamp, session_id, actor_id, command, sql, handle, executed,
            cached, success, error_code)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-            .run(id, this.now().toISOString(), input.sessionId, input.actorId, input.command, input.handle ?? null, input.executed ? 1 : 0, input.cached ? 1 : 0, input.success ? 1 : 0, input.errorCode ?? null);
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+            .run(id, this.now().toISOString(), input.sessionId, input.actorId, input.command, boundedHistorySql(input.sql), input.handle ?? null, input.executed ? 1 : 0, input.cached ? 1 : 0, input.success ? 1 : 0, input.errorCode ?? null);
         this.db
             .prepare(`DELETE FROM history
          WHERE rowid IN (
@@ -1010,6 +1011,22 @@ export class StateStore {
         }
     }
 }
+function boundedHistorySql(sql) {
+    if (sql === undefined)
+        return null;
+    if (Buffer.byteLength(sql, "utf8") <= MAX_HISTORY_SQL_BYTES)
+        return sql;
+    const suffix = "…";
+    let prefix = "";
+    for (const character of sql) {
+        if (Buffer.byteLength(`${prefix}${character}${suffix}`, "utf8") >
+            MAX_HISTORY_SQL_BYTES) {
+            break;
+        }
+        prefix += character;
+    }
+    return `${prefix}${suffix}`;
+}
 function restrictMode(path, allowed) {
     chmodSync(path, statSync(path).mode & allowed);
 }

package/dist/src/types.d.ts

@@ -64,6 +64,7 @@ export interface HistoryEntry {
     session_id: string;
     actor_id: string;
     command: string;
+    sql: string | null;
     handle: string | null;
     executed: boolean;
     cached: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fadhilp/stateql",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Stateful, agent-oriented database CLI for safe result reuse",
   "repository": {
     "type": "git",