@sixb/sqlite 0.1.25 → 0.1.26

package/dist/migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,KAAK,EAGV,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,oBAAoB,CAAA;AAmI3B,eAAO,MAAM,yBAAyB,sBAAsB,CAAA;AAC5D,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD,eAAO,MAAM,uBAAuB,wBAyKlC,CAAA;AAEF,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,CAQ9E;AAED,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC1C,OAAO,GAAE,oBAAyB,GACjC,aAAa,CAAC,QAAQ,CAAC,CAEzB;AAOD,mGAAmG;AACnG,wBAAgB,mBAAmB,IAAI,QAAQ,CAY9C;AAaD,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,eAAe,EAAE,CAOzF;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC5C,GAAG,eAAe,CAoBlB;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1E"}
+{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,KAAK,EAGV,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,oBAAoB,CAAA;AAmI3B,eAAO,MAAM,yBAAyB,sBAAsB,CAAA;AAC5D,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD,eAAO,MAAM,uBAAuB,wBA2KlC,CAAA;AAEF,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,CAQ9E;AAED,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC1C,OAAO,GAAE,oBAAyB,GACjC,aAAa,CAAC,QAAQ,CAAC,CAEzB;AAOD,mGAAmG;AACnG,wBAAgB,mBAAmB,IAAI,QAAQ,CAY9C;AAaD,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,eAAe,EAAE,CAOzF;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC5C,GAAG,eAAe,CAoBlB;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1E"}

package/dist/objects/query-compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-compiler.d.ts","sourceRoot":"","sources":["../../src/objects/query-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAEhB,KAAK,oBAAoB,EAG1B,MAAM,YAAY,CAAA;AASnB,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,UAAU,CAAA;AAEhF,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE;QACZ,GAAG,EAAE,MAAM,CAAA;QACX,IAAI,EAAE,WAAW,EAAE,CAAA;QACnB,KAAK,EAAE,MAAM,CAAA;QACb,gFAAgF;QAChF,QAAQ,EAAE,MAAM,CAAA;QAChB,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;IACD,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,WAAW,EAAE,CAAA;IACxB,KAAK,EAAE,aAAa,CAAA;IACpB,YAAY,CAAC,EAAE,oBAAoB,CAAA;IACnC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IAClD,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAA;IAC7C,aAAa,CAAC,IAAI,EAAE,SAAS,wBAAwB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAC/F;AAED,UAAU,oBAAoB;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;CACnC;AAOD,UAAU,iBAAiB;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,WAAW,EAAE,CAAA;CACpB;AAED,UAAU,aAAa;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,MAAM,EAAE,SAAS,kBAAkB,EAAE,CAAA;IACrC,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,KAAK,kBAAkB,GACnB;IACE,IAAI,EAAE,UAAU,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAC1B,GACD;IACE,IAAI,EAAE,QAAQ,CAAA;IACd,MAAM,EAAE,gBAAgB,GAAG,YAAY,GAAG,eAAe,CAAA;IACzD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAC1B,CAAA;AAoBL,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,EAClB,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,uBAAuB,CAAA;CAAO,GACzE,mBAAmB,CAUrB;AAED,4DAA4D;AAC5D,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,8BAA8B,CAAC,EAAE,MAAM,CAAA;IAChD;;;;OAIG;IACH,aAAa,CAAC,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,CAAA;IACxD,kGAAkG;IAClG,aAAa,CACX,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,SAAS,WAAW,EAAE,GAC5B;QACD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;QACpB,QAAQ,CAAC,IAAI,EAAE,SAAS,WAAW,EAAE,CAAA;KACtC,CAAA;IACD,SAAS,CAAC,KAAK,EAAE,mBAAmB,GAAG,mBAAmB,CAAA;CAC3D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,WAAW,EAAE,CAAA;KAAE,CAAA;CAClF;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,MAAM,GACnB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,SAAS,WAAW,EAAE,CAAA;CAAE,CASjE;AAED,eAAO,MAAM,2BAA2B,EAAE,uBAKzC,CAAA;AAg0BD,gGAAgG;AAChG,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMzD;AAED,+FAA+F;AAC/F,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,oBAAoB,GAAG,iBAAiB,CAgEnF"}
+{"version":3,"file":"query-compiler.d.ts","sourceRoot":"","sources":["../../src/objects/query-compiler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sixb/sqlite",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "SQLite storage provider for Sixb",
   "keywords": [
     "sixb",
@@ -37,10 +37,10 @@
     "prepack": "bun run build"
   },
   "peerDependencies": {
-    "@sixb/core": "0.1.25"
+    "@sixb/core": "0.1.26"
   },
   "devDependencies": {
-    "@sixb/core": "0.1.25",
+    "@sixb/core": "0.1.26",
     "@types/bun": "latest",
     "typescript": "^5.7.0"
   },

package/src/agents/messages.ts

@@ -120,6 +120,19 @@ export class SqliteAgentMessageStore implements AgentMessageStore {
 
   async deleteByRunId(input: DeleteAgentMessagesByRunInput): Promise<number> {
     return this.db.transaction(() => {
+      if (input.fence) {
+        const owner = this.db
+          .query(
+            "SELECT 1 AS present FROM agent_runs WHERE project_id = ? AND id = ? AND status = 'running' AND execution_token = ?"
+          )
+          .get(input.projectId, input.fence.runId, input.fence.executionToken)
+        if (!owner) {
+          throw new AgentStorageError(
+            "execution_lost",
+            `[SixbSqlite] Execution token is no longer current on agent run '${input.fence.runId}'.`
+          )
+        }
+      }
       const thread = this.db
         .query("SELECT 1 AS present FROM agent_threads WHERE project_id = ? AND id = ?")
         .get(input.projectId, input.threadId) as { present: number } | null

package/src/agents/rows.ts

@@ -32,6 +32,8 @@ export interface AgentThreadRow {
   title: string | null
   sandbox_params: string | null
   sandbox_state: string | null
+  runs_on: "computer" | null
+  computer_id: string | null
   status: AgentThreadRecord["status"]
   active_run_id: string | null
   last_message_at: string | null
@@ -69,6 +71,7 @@ export interface AgentRunRow {
   attempt: number
   execution_token: string | null
   execution_queue_lease_expires_at: string | null
+  cancel_requested_at: string | null
   created_at: string
   started_at: string | null
   completed_at: string | null
@@ -133,6 +136,8 @@ export function rowToThreadRecord(row: AgentThreadRow): AgentThreadRecord {
     ...(row.sandbox_params == null
       ? {}
       : { sandboxParams: snapshotAgentThreadSandboxParams(JSON.parse(row.sandbox_params)) }),
+    ...(row.runs_on == null ? {} : { runsOn: row.runs_on }),
+    ...(row.computer_id == null ? {} : { computerId: row.computer_id }),
     status: row.status,
     activeRunId: row.active_run_id,
     lastMessageAt: row.last_message_at ? new Date(row.last_message_at) : undefined,
@@ -161,6 +166,7 @@ export function rowToRunRecord(row: AgentRunRow): AgentRunRecord {
             queueLeaseExpiresAt: new Date(row.execution_queue_lease_expires_at),
           }
         : undefined,
+    cancelRequestedAt: row.cancel_requested_at ? new Date(row.cancel_requested_at) : undefined,
     createdAt: new Date(row.created_at),
     startedAt: row.started_at ? new Date(row.started_at) : undefined,
     completedAt: row.completed_at ? new Date(row.completed_at) : undefined,

package/src/agents/runs.ts

@@ -29,6 +29,7 @@ import {
   type ListAgentRunsResult,
   type ListThreadSubagentsInput,
   type ReclaimAgentRunInput,
+  type RequestAgentRunCancelInput,
   type StartAgentRunInput,
   type SubagentRunRecord,
 } from "@sixb/core/storage"
@@ -326,7 +327,17 @@ export class SqliteAgentRunStore implements AgentRunStore {
 
   async reclaim(input: ReclaimAgentRunInput): Promise<AgentRunRecord> {
     return this.db.transaction(() => {
-      this.requireRunning(input.projectId, input.id)
+      const run = this.requireRunning(input.projectId, input.id)
+      if (
+        input.ifLapsedBy &&
+        run.execution_queue_lease_expires_at !== null &&
+        new Date(run.execution_queue_lease_expires_at).getTime() > input.ifLapsedBy.getTime()
+      ) {
+        throw new AgentStorageError(
+          "invalid_state",
+          `[SixbSqlite] Agent run '${input.id}' is still held by its runner, whose lease has not lapsed.`
+        )
+      }
       this.db
         .query(
           `
@@ -373,6 +384,21 @@ export class SqliteAgentRunStore implements AgentRunStore {
     })()
   }
 
+  async requestCancel(input: RequestAgentRunCancelInput): Promise<AgentRunRecord> {
+    return this.db.transaction(() => {
+      this.db
+        .query(
+          `
+          UPDATE agent_runs
+          SET cancel_requested_at = ?
+          WHERE project_id = ? AND id = ? AND status = 'running' AND cancel_requested_at IS NULL
+        `
+        )
+        .run((input.at ?? new Date()).toISOString(), input.projectId, input.id)
+      return this.requireRun(input.projectId, input.id)
+    })()
+  }
+
   async finish(input: FinishAgentRunInput): Promise<AgentRunRecord> {
     const completedAt = input.completedAt ?? new Date()
     const errorValue =

package/src/agents/threads.ts

@@ -1,6 +1,9 @@
 import type { Database } from "bun:sqlite"
 import {
+  assertAssignableComputer,
+  assertComputerId,
   assertConversationThreadRow,
+  assertRunsOn,
   participantsToAdd,
   planAgentThreadFork,
   remapArtifactIds,
@@ -15,6 +18,7 @@ import {
   type AgentThreadRecord,
   type AgentThreadSandboxState,
   type AgentThreadStore,
+  type AssignAgentThreadComputerInput,
   type CreateAgentThreadInput,
   type ForkAgentThreadInput,
   type ListAgentThreadChildrenInput,
@@ -64,6 +68,7 @@ export class SqliteAgentThreadStore implements AgentThreadStore {
   }
 
   async create(input: CreateAgentThreadInput): Promise<AgentThreadRecord> {
+    assertRunsOn(input.runsOn, "Agent thread", "SixbSqlite")
     const sandboxParams =
       input.sandboxParams === undefined
         ? null
@@ -82,13 +87,14 @@ export class SqliteAgentThreadStore implements AgentThreadStore {
             owner_principal_id,
             title,
             sandbox_params,
+            runs_on,
             status,
             active_run_id,
             last_message_at,
             message_count,
             created_at,
             updated_at
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, NULL, NULL, 0, ?, ?)
+          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, 0, ?, ?)
         `
         )
         .run(
@@ -98,6 +104,7 @@ export class SqliteAgentThreadStore implements AgentThreadStore {
           input.ownerPrincipal.id,
           input.title ?? null,
           sandboxParams,
+          input.runsOn ?? null,
           input.status ?? "active",
           createdAt.toISOString(),
           updatedAt.toISOString()
@@ -403,6 +410,25 @@ export class SqliteAgentThreadStore implements AgentThreadStore {
     return result.changes > 0
   }
 
+  async assignComputer(input: AssignAgentThreadComputerInput): Promise<AgentThreadRecord> {
+    assertComputerId(input.computerId, "SixbSqlite")
+    this.db
+      .query(`
+        UPDATE agent_threads SET computer_id = ?
+        WHERE project_id = ? AND id = ? AND runs_on = 'computer'
+          ${input.ifUnassigned ? "AND computer_id IS NULL" : ""}
+      `)
+      .run(input.computerId, input.projectId, input.id)
+
+    // Read in the same tick: nothing else writes to the database in between.
+    const row = this.db
+      .query("SELECT * FROM agent_threads WHERE project_id = ? AND id = ?")
+      .get(input.projectId, input.id) as AgentThreadRow | null
+    const thread = row ? rowToThreadRecord(row) : null
+    assertAssignableComputer(thread, input.id, "SixbSqlite")
+    return thread
+  }
+
   async listParticipants(
     input: ListAgentThreadParticipantsInput
   ): Promise<readonly AgentThreadParticipantRecord[]> {

package/src/migrations/080-agent-run-cancel-requests.sql

@@ -0,0 +1,3 @@
+-- A cancel is recorded on the run, not only broadcast: a runner that never hears the broker learns
+-- of it at its next lease renewal, and the run token stops working at once.
+ALTER TABLE agent_runs ADD COLUMN cancel_requested_at TEXT;

package/src/migrations/081-agent-thread-runs-on.sql

@@ -0,0 +1,4 @@
+-- Where a conversation's turns run: NULL in the cloud, 'computer' on its owner's computer.
+ALTER TABLE agent_threads ADD COLUMN runs_on TEXT CHECK (runs_on IS NULL OR runs_on = 'computer');
+-- Which of its owner's computers runs a computer's thread: NULL until one claims its first turn.
+ALTER TABLE agent_threads ADD COLUMN computer_id TEXT;

package/src/migrations.ts

@@ -311,6 +311,8 @@ export const sqliteStorageMigrations = defineMigrations({
       { checksum: checksum(subagentThreadsSql) }
     ),
     sqliteSql("079-subagent-questions", subagentQuestionsSql),
+    sqliteSql("080-agent-run-cancel-requests", agentRunCancelRequestsSql),
+    sqliteSql("081-agent-thread-runs-on", agentThreadRunsOnSql),
   ],
 })
 
@@ -709,3 +711,7 @@ import agentApprovalResumeSql from "./migrations/077-agent-approval-resume.sql"
 }
 import subagentThreadsSql from "./migrations/078-subagent-threads.sql" with { type: "text" }
 import subagentQuestionsSql from "./migrations/079-subagent-questions.sql" with { type: "text" }
+import agentRunCancelRequestsSql from "./migrations/080-agent-run-cancel-requests.sql" with {
+  type: "text",
+}
+import agentThreadRunsOnSql from "./migrations/081-agent-thread-runs-on.sql" with { type: "text" }

package/src/objects/query-compiler.ts

@@ -698,12 +698,12 @@ function compileExpansionsObject(
   return { sql: `json_object(${parts.join(", ")})`, args }
 }
 
-// One expansion's hydrated value. `row_number()` numbers a parent's links by the
-// order from `compileExpansionOrder` (the expansion's `orderBy` against the target
-// object's properties, then an identity tiebreak); `WHERE _ord <= N` keeps the
-// top-N per parent in-DB; each retained neighbour becomes a JSON object; and the
-// value is an ordered array ("many") or the first element or null ("one"). The
-// cardinality is core-resolved before pushdown.
+// One expansion's hydrated value. A parent's links are read in the order from
+// `compileExpansionOrder` (the expansion's `orderBy` against the target object's
+// properties, then an identity tiebreak) and `LIMIT N` keeps the top-N per parent
+// in-DB; each retained neighbour becomes a JSON object; and the value is an
+// ordered array ("many", numbered by `row_number()` for `json_group_array`) or the
+// first neighbour or null ("one"). The cardinality is core-resolved before pushdown.
 function compileExpansionValue(
   expansion: ObjectExpansion,
   parent: ExpansionParent,
@@ -736,8 +736,7 @@ function compileExpansionValue(
     whereArgs.push(expansion.sourceObjectTypeId)
   }
 
-  const inner = `
-    SELECT ${child.sql} AS elem, row_number() OVER (ORDER BY ${order.sql}) AS _ord
+  const from = `
     FROM ${ctx.source.linksTable} AS ${edge}
     JOIN ${ctx.source.objectsTable} AS ${target}
       ON ${target}.project_id = ${edge}.project_id
@@ -745,12 +744,13 @@ function compileExpansionValue(
      AND ${target}.primary_id = ${neighborId}
     WHERE ${whereParts.join(" AND ")}
   `
-  const innerArgs = [...child.args, ...order.args, ...whereArgs]
 
+  // ORDER BY ... LIMIT stops at the kept neighbours, so only they are built as JSON. Filtering
+  // on row_number() would build every neighbour first, in a co-routine per parent.
   if (expansion.cardinality === "one") {
     return {
-      sql: `(SELECT ${ranked}.elem FROM (${inner}) AS ${ranked} WHERE ${ranked}._ord = 1)`,
-      args: innerArgs,
+      sql: `(SELECT ${child.sql} ${from} ORDER BY ${order.sql} LIMIT 1)`,
+      args: [...child.args, ...whereArgs, ...order.args],
     }
   }
 
@@ -759,8 +759,13 @@ function compileExpansionValue(
   // rather than the quoted JSON text the subquery column hands back.
   const limit = expansion.limit ?? DEFAULT_EXPANSION_FANOUT
   return {
-    sql: `COALESCE((SELECT json_group_array(json(${ranked}.elem) ORDER BY ${ranked}._ord) FROM (${inner}) AS ${ranked} WHERE ${ranked}._ord <= ?), '[]')`,
-    args: [...innerArgs, limit],
+    sql: `COALESCE((SELECT json_group_array(json(${ranked}.elem) ORDER BY ${ranked}._ord) FROM (
+      SELECT ${child.sql} AS elem, row_number() OVER (ORDER BY ${order.sql}) AS _ord
+      ${from}
+      ORDER BY ${order.sql}
+      LIMIT ?
+    ) AS ${ranked}), '[]')`,
+    args: [...child.args, ...order.args, ...whereArgs, ...order.args, limit],
   }
 }