@sixb/core 0.1.10 → 0.1.11

package/dist/testing/lake-storage-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lake-storage-contract.d.ts","sourceRoot":"","sources":["../../src/testing/lake-storage-contract.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEpE,MAAM,MAAM,oCAAoC,GAAG,QAAQ,GAAG,oBAAoB,CAAA;AAElF,MAAM,WAAW,+BAA+B,CAAC,QAAQ,SAAS,WAAW,GAAG,WAAW;IACzF,+EAA+E;IAC/E,QAAQ,CAAC,aAAa,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1D,sDAAsD;IACtD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/D;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,oCAAoC,CAAA;IAC/D;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACnC;AA2CD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,SAAS,WAAW,EACtE,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,+BAA+B,CAAC,QAAQ,CAAC,GACjD,IAAI,CA6uBN"}
+{"version":3,"file":"lake-storage-contract.d.ts","sourceRoot":"","sources":["../../src/testing/lake-storage-contract.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEpE,MAAM,MAAM,oCAAoC,GAAG,QAAQ,GAAG,oBAAoB,CAAA;AAElF,MAAM,WAAW,+BAA+B,CAAC,QAAQ,SAAS,WAAW,GAAG,WAAW;IACzF,+EAA+E;IAC/E,QAAQ,CAAC,aAAa,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1D,sDAAsD;IACtD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/D;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,oCAAoC,CAAA;IAC/D;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACnC;AA2CD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,SAAS,WAAW,EACtE,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,+BAA+B,CAAC,QAAQ,CAAC,GACjD,IAAI,CA0wBN"}

package/dist/testing/ontology-storage-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ontology-storage-contract.d.ts","sourceRoot":"","sources":["../../src/testing/ontology-storage-contract.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACtE,OAAO,EAML,KAAK,uBAAuB,EAC7B,MAAM,6BAA6B,CAAA;AAGpC,MAAM,WAAW,8BAA+B,SAAQ,uBAAuB;IAC7E,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAA;CAC9C;AAED,MAAM,WAAW,mCAAmC,CAClD,QAAQ,SAAS,8BAA8B,GAAG,8BAA8B;IAEhF,4FAA4F;IAC5F,QAAQ,CAAC,aAAa,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1D,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,kFAAkF;IAClF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC/D;AAkDD;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,QAAQ,SAAS,8BAA8B,EAC7F,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,mCAAmC,CAAC,QAAQ,CAAC,GACrD,IAAI,CA6sBN"}
+{"version":3,"file":"ontology-storage-contract.d.ts","sourceRoot":"","sources":["../../src/testing/ontology-storage-contract.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACtE,OAAO,EAML,KAAK,uBAAuB,EAC7B,MAAM,6BAA6B,CAAA;AAGpC,MAAM,WAAW,8BAA+B,SAAQ,uBAAuB;IAC7E,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAA;CAC9C;AAED,MAAM,WAAW,mCAAmC,CAClD,QAAQ,SAAS,8BAA8B,GAAG,8BAA8B;IAEhF,4FAA4F;IAC5F,QAAQ,CAAC,aAAa,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1D,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,kFAAkF;IAClF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC/D;AAkDD;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,QAAQ,SAAS,8BAA8B,EAC7F,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,mCAAmC,CAAC,QAAQ,CAAC,GACrD,IAAI,CAktBN"}

package/dist/webhooks/internal.js

@@ -12,7 +12,7 @@ import"../chunk-vsj3mdfj.js";
 import"../chunk-g00bfdq6.js";
 import"../chunk-q5gz3g2j.js";
 import"../chunk-pqajwytd.js";
-import"../chunk-e0d1rzef.js";
+import"../chunk-jsy70480.js";
 import"../chunk-gfdh9kqa.js";
 import"../chunk-39tqv9hz.js";
 import"../chunk-7bs40fe1.js";
@@ -27,7 +27,7 @@ import {
 import"../chunk-ap0g1g74.js";
 import {
   canRetryWebhookRun2
-} from "../chunk-p6a4npdx.js";
+} from "../chunk-gqm76kse.js";
 import"../chunk-c5rkjrgp.js";
 import"../chunk-gqh45d2n.js";
 import"../chunk-z30bv4ga.js";

package/dist/workflows/index.js

@@ -8,7 +8,7 @@ import {
   defineWorkflow2,
   createWorkflowNodeFailure2,
   unwrapWorkflowNodeFailure2
-} from "../chunk-t1f4f1ve.js";
+} from "../chunk-3ckk0xfj.js";
 import"../chunk-e1c18xjx.js";
 import"../chunk-fb3feg1e.js";
 import"../chunk-dfm066qg.js";
@@ -44,26 +44,26 @@ import {
   snapshotWorkflowActionInput2,
   WorkflowRunDispatcher2,
   requestWorkflowRun2
-} from "../chunk-5p1v802y.js";
-import"../chunk-5c7ga8zz.js";
+} from "../chunk-gq8vhakp.js";
+import"../chunk-cfvakeax.js";
 import"../chunk-v2vcg0w6.js";
 import"../chunk-awbhdqyc.js";
-import"../chunk-976rxdpx.js";
+import"../chunk-z0s4axeh.js";
 import"../chunk-85cd7e8c.js";
-import"../chunk-b0ec55a1.js";
-import"../chunk-28ja2cjs.js";
+import"../chunk-g91qxjj0.js";
+import"../chunk-d63nnr5b.js";
 import"../chunk-g6cke204.js";
 import"../chunk-0y39rgsb.js";
 import"../chunk-5a4a52tq.js";
 import"../chunk-mrp7k0pw.js";
 import"../chunk-9qsh3p5y.js";
 import"../chunk-860dwwy0.js";
-import"../chunk-p5vcsw9c.js";
-import"../chunk-nmbxcaqx.js";
-import"../chunk-g7knyczr.js";
+import"../chunk-sepyxgpc.js";
+import"../chunk-01kj2pbh.js";
+import"../chunk-a0e6x5hd.js";
 import"../chunk-ftv470j8.js";
 import"../chunk-17kfctj6.js";
-import"../chunk-p6a4npdx.js";
+import"../chunk-gqm76kse.js";
 import"../chunk-qf954wje.js";
 import"../chunk-pr2h4bv4.js";
 import"../chunk-8vj0rjgs.js";
@@ -81,7 +81,7 @@ import"../chunk-s3csryxe.js";
 import"../chunk-jgwb25gc.js";
 import"../chunk-93csa55g.js";
 import"../chunk-b19g04jk.js";
-import"../chunk-e0d1rzef.js";
+import"../chunk-jsy70480.js";
 import"../chunk-pqajwytd.js";
 import"../chunk-ap0g1g74.js";
 import"../chunk-653vwrzr.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sixb/core",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "The ontology-first runtime for Sixb — objects, links, telemetry, actions, and provider contracts",
   "keywords": [
     "sixb",

package/src/agents/model-loop.ts

@@ -255,6 +255,13 @@ export async function runModelLoop(
     }
 
     const localCalls = response.toolCalls.filter((call) => call.part.providerExecuted !== true)
+    // Closed tool arguments are not proof of a successful response. In particular,
+    // providers can close valid JSON before reporting truncation or content filtering.
+    if (localCalls.length > 0 && !["stop", "tool-calls", "pause"].includes(response.finishReason)) {
+      throw new ModelStreamError(
+        `[SixbModels] Cannot execute local tools after '${response.finishReason}'.`
+      )
+    }
     if (
       input.rejectLocalToolCalls &&
       (localCalls.length > 0 || response.finishReason === "tool-calls")

package/src/blob-storage/types.ts

@@ -87,6 +87,8 @@ export interface DirectPutBlobUploadSession {
 
 export interface MultipartBlobUploadSession {
   readonly strategy: "multipart"
+  /** Required upload-response receipt. Omission defaults to "etag" for compatibility. */
+  readonly partReceipt?: "etag" | "none"
   readonly uploadId: string
   readonly partSizeBytes: number
   readonly expiresAt: Date
@@ -114,7 +116,8 @@ export interface SignedBlobUploadPart {
 
 export interface BlobUploadPart {
   readonly partNumber: number
-  readonly etag: string
+  /** Required when the multipart session's partReceipt is "etag" or omitted. */
+  readonly etag?: string
 }
 
 export interface CompleteBlobUploadInput {

package/src/connectors/connections/command-context.ts

@@ -50,10 +50,7 @@ export function assertConnectorConnectionRunInitiator(
   current: ConnectorConnectionCommandActor,
   connectorId: string
 ): asserts execution is ExecutionRecord {
-  const initiating = execution
-    ? connectorConnectionActorFromExecution(execution, execution.projectId)
-    : null
-  if (!initiating || !sameConnectorConnectionCommandActor(initiating, current)) {
+  if (!isConnectorConnectionRunInitiator(execution, current)) {
     throw new AuthorizationError(
       `connection-run:connector:${connectorId}`,
       "[Sixb] This connector connection run can only be accessed by its initiating actor."
@@ -61,6 +58,26 @@ export function assertConnectorConnectionRunInitiator(
   }
 }
 
+/** User-owned runs survive session renewal; access-token runs remain bound to their credential. */
+export function isConnectorConnectionRunInitiator(
+  execution: ExecutionRecord | null,
+  current: ConnectorConnectionCommandActor
+): boolean {
+  const initiating = execution
+    ? connectorConnectionActorFromExecution(execution, execution.projectId)
+    : null
+  if (!initiating) return false
+  if (
+    initiating.principal.type === "user" &&
+    current.principal.type === "user" &&
+    initiating.credential.type === "session" &&
+    current.credential.type === "session"
+  ) {
+    return initiating.principal.id === current.principal.id
+  }
+  return sameConnectorConnectionCommandActor(initiating, current)
+}
+
 function connectorConnectionActorFromExecution(
   execution: CreateExecutionInput | ExecutionRecord,
   projectId: string

package/src/connectors/connections/contracts.ts

@@ -118,7 +118,6 @@ export type ConnectorConnectionRunView =
       readonly status: "waiting"
       readonly waitingFor: "account_selection"
       readonly accounts: readonly ConnectorAccountCandidate[]
-      readonly expiresAt: Date
     })
   | (ConnectorConnectionRunViewBase & {
       readonly status: "succeeded"
@@ -162,6 +161,10 @@ export interface ConnectorConnectionProcess {
     connectorId: string,
     input: AddConnectorConnectionInput
   ): Promise<ConnectorConnectionRunView>
+  listPendingConnectionRuns(
+    context: ConnectorConnectionCommandContext,
+    connectorId: string
+  ): Promise<readonly ConnectorConnectionRunView[]>
   getConnectionRun(
     context: ConnectorConnectionCommandContext,
     connectorId: string,

package/src/connectors/connections/execution.ts

@@ -31,6 +31,7 @@ export interface ConnectorConnectionsRuntime {
     connectorId: string,
     input: AddConnectorConnectionInput
   ): Promise<ConnectorConnectionRunView>
+  listPendingConnectionRuns(connectorId: string): Promise<readonly ConnectorConnectionRunView[]>
   getConnectionRun(connectorId: string, runId: string): Promise<ConnectorConnectionRunView | null>
   selectConnectionRunAccount(
     connectorId: string,
@@ -77,6 +78,8 @@ export function createConnectorConnectionsRuntime(
       process.startConnectionRun(contextFor(connectorId), connectorId, input),
     addConnection: (connectorId, input) =>
       process.addConnection(contextFor(connectorId), connectorId, input),
+    listPendingConnectionRuns: (connectorId) =>
+      process.listPendingConnectionRuns(contextFor(connectorId), connectorId),
     getConnectionRun: (connectorId, runId) =>
       process.getConnectionRun(contextFor(connectorId), connectorId, runId),
     selectConnectionRunAccount: (connectorId, input) =>

package/src/connectors/connections/runs.ts

@@ -16,6 +16,7 @@ import {
 } from "./authorizations"
 import {
   assertConnectorConnectionRunInitiator,
+  isConnectorConnectionRunInitiator,
   requireConnectorConnectionCommandActor,
 } from "./command-context"
 import type {
@@ -238,6 +239,42 @@ export class ConnectorConnectionRunService {
     }
   }
 
+  async listPending(
+    command: ConnectorConnectionCommandContext,
+    connectorId: string
+  ): Promise<readonly ConnectorConnectionRunView[]> {
+    const actor = requireConnectorConnectionCommandActor(command.execution, this.projectId)
+    const candidates = await withConnectorStorageBoundary(
+      "Pending connector connection runs could not be read.",
+      () =>
+        this.connectionStorage.listPendingConnectionRuns({ projectId: this.projectId, connectorId })
+    )
+    const runs: ConnectorConnectionRunView[] = []
+    for (const candidate of candidates) {
+      const initiating = await withConnectorStorageBoundary(
+        "Connector connection run initiating execution could not be read.",
+        () =>
+          this.storage.executions.getById({
+            projectId: this.projectId,
+            id: candidate.initiatedByExecutionId,
+          })
+      )
+      if (!isConnectorConnectionRunInitiator(initiating, actor)) continue
+      // Re-read through the normal expiry/cleanup path before exposing accounts.
+      const run = await this.get(command, connectorId, candidate.id)
+      if (
+        run &&
+        (run.status === "running" ||
+          (run.status === "waiting" && run.waitingFor === "account_selection"))
+      )
+        runs.push(run)
+    }
+    return runs.sort(
+      (left, right) =>
+        right.createdAt.getTime() - left.createdAt.getTime() || left.id.localeCompare(right.id)
+    )
+  }
+
   async get(
     command: ConnectorConnectionCommandContext,
     connectorId: string,
@@ -581,7 +618,6 @@ export class ConnectorConnectionRunService {
         status: "waiting",
         waitingFor: "account_selection",
         accounts: authorization.accounts,
-        expiresAt: run.expiresAt,
       }
     }
     if (run.status === "succeeded") {
@@ -645,6 +681,7 @@ export class ConnectorConnectionRunService {
       : CLEANUP_RETRY_DELAY_MS
   ): void {
     this.cancelRunMaintenance(run.id)
+    if (run.status === "waiting" && run.waitingFor === "account_selection") return
     const timer = setTimeout(
       () => void this.maintainRun(run.connectorId, run.id),
       Math.min(delayMs, MAX_TIMER_DELAY_MS)

package/src/connectors/connections/service.ts

@@ -66,6 +66,7 @@ export interface ConnectorConnectionServiceOptions {
   readonly storage?: Storage
   readonly credentialProtector?: ConnectorCredentialProtector
   readonly authorizationAttemptTtlMs?: number
+  /** @deprecated Selection no longer expires; retained for legacy storage metadata only. */
   readonly accountSelectionTtlMs?: number
   readonly credentialMutationLeaseMs?: number
   readonly providerOperationTimeoutMs?: number
@@ -322,6 +323,11 @@ export class ConnectorConnectionService implements ConnectorConnectionProcess {
     })
   }
 
+  listPendingConnectionRuns(command: ConnectorConnectionCommandContext, connectorId: string) {
+    this.requireOAuthDefinition(connectorId)
+    return this.runs.listPending(command, connectorId)
+  }
+
   getConnectionRun(
     command: ConnectorConnectionCommandContext,
     connectorId: string,

package/src/events/outbox-dispatcher.ts

@@ -46,6 +46,7 @@ export interface OntologyOutboxDispatcherOptions {
   readonly maxIsolationAttempts?: number
   /** Maximum claimed batches handled by one drain pass. */
   readonly maxClaimsPerDrain?: number
+  /** Broker grace period. Shutdown still waits for outstanding storage operations afterward. */
   readonly shutdownTimeoutMs?: number
   readonly now?: () => Date
   readonly random?: () => number
@@ -100,10 +101,10 @@ export class OntologyOutboxDispatcher {
   private readonly createLeaseId: () => string
   private readonly onDeliveryFailure?: OntologyOutboxDispatcherOptions["onDeliveryFailure"]
   private readonly onError: (error: unknown) => void
-  private readonly inFlight = new Set<ClaimedBatch>()
   private draining: Promise<void> | null = null
   private pendingDrain: Promise<void> | null = null
   private stopping: Promise<void> | null = null
+  private closing = false
   private stopRequested = false
   private readonly forcedStop = new AbortController()
 
@@ -166,7 +167,7 @@ export class OntologyOutboxDispatcher {
    * mutation.
    */
   drain(): Promise<void> {
-    if (this.stopRequested) return Promise.resolve()
+    if (this.closing || this.stopRequested) return Promise.resolve()
     if (!this.draining) return this.startDrainPass()
 
     this.pendingDrain ??= settled(this.draining).then(() => {
@@ -178,7 +179,7 @@ export class OntologyOutboxDispatcher {
 
   /** Starts a tracked, best-effort drain without extending mutation latency. */
   notify(): void {
-    if (this.stopRequested) return
+    if (this.closing || this.stopRequested) return
     void this.drain().catch((error) => this.reportError(error))
   }
 
@@ -193,19 +194,16 @@ export class OntologyOutboxDispatcher {
     // Include one final bounded pass so commits whose notifications were coalesced immediately
     // before shutdown are not left pending merely because the process is stopping.
     const gracefulDrain = this.drain().catch((error) => this.reportError(error))
-    if (await settlesWithin(gracefulDrain, this.shutdownTimeoutMs)) {
-      this.stopRequested = true
-      return
-    }
-
+    this.closing = true
+    const finished = await settlesWithin(gracefulDrain, this.shutdownTimeoutMs)
     this.stopRequested = true
-    this.forcedStop.abort()
-    await settlesWithin(
-      this.rescheduleUnsettledForShutdown(),
-      Math.min(this.shutdownTimeoutMs, 1_000)
-    )
-    this.draining = null
-    this.pendingDrain = null
+    if (!finished) this.forcedStop.abort()
+    // Storage operations cannot be cancelled by this contract. A late claim must release its
+    // lease, and an acknowledgement already started must finish before callers close storage.
+    // publishClaim owns settlement, including forced stop; never race a second cleanup against it.
+    await gracefulDrain
+    if (this.draining) await settled(this.draining)
+    if (this.pendingDrain) await settled(this.pendingDrain)
   }
 
   private startDrainPass(): Promise<void> {
@@ -224,11 +222,14 @@ export class OntologyOutboxDispatcher {
       if (rows.length === 0) return
       const publishedCount = await this.publishClaim(rows)
       if (this.stopRequested || publishedCount === 0 || rows.length < this.batchSize) return
+      // In-memory/SQLite can resolve without I/O. Yield between full batches so catch-up cannot
+      // monopolize the event loop, while keeping small post-commit deliveries immediate.
+      await new Promise<void>((resolve) => setImmediate(resolve))
     }
 
     // A healthy full slice means more due rows may remain. Reuse the existing coalescing path so
     // catch-up continues without recursion, an idle polling loop, or an unbounded individual pass.
-    if (!this.stopRequested) this.notify()
+    if (!this.closing && !this.stopRequested) this.notify()
   }
 
   private claimBatch(): Promise<readonly ClaimedOntologyOutboxRow[]> {
@@ -247,7 +248,6 @@ export class OntologyOutboxDispatcher {
   private async publishClaim(rows: readonly ClaimedOntologyOutboxRow[]): Promise<number> {
     const claim = new ClaimedBatch(rows)
     const failures = new DeliveryFailureAccumulator()
-    this.inFlight.add(claim)
     const pending: PublicationGroup[] = [{ rows }]
     let publishAttempts = 0
     let publishedCount = 0
@@ -288,7 +288,6 @@ export class OntologyOutboxDispatcher {
       if (this.stopRequested) {
         await this.rescheduleClaimedForShutdown(claim.close())
       }
-      this.inFlight.delete(claim)
       for (const failure of failures.list()) {
         this.reportDeliveryFailure(failure.error, failure.context)
       }
@@ -378,15 +377,10 @@ export class OntologyOutboxDispatcher {
     }
   }
 
-  private async rescheduleUnsettledForShutdown(): Promise<void> {
-    for (const claim of [...this.inFlight]) {
-      await this.rescheduleClaimedForShutdown(claim.close())
-      this.inFlight.delete(claim)
-    }
-  }
-
   private withOutbox<T>(run: (outbox: OntologyOutboxStorage) => Promise<T> | T): Promise<T> {
-    return this.storage.transaction((tx) => run(tx.ontology.outbox))
+    // Every outbox method owns its atomic provider operation. A framework-wide transaction
+    // adds no guarantee here and copies the entire InMemoryStorage state for every batch.
+    return Promise.resolve(run(this.storage.ontology.outbox))
   }
 
   private reportDeliveryFailure(error: unknown, failure: OntologyOutboxDeliveryFailure): void {

package/src/lake-storage/in-memory.ts

@@ -367,6 +367,7 @@ export class InMemoryLakeStorage implements LakeStorage {
   }
 
   async *readRows(input: ReadDatasetRowsInput): AsyncIterable<DatasetRow> {
+    input.signal?.throwIfAborted()
     const definition = this.datasets.get(input.datasetId)
     if (!definition) {
       throw new LakeStorageError(`[LakeStorage] Unknown dataset '${input.datasetId}'`)
@@ -390,6 +391,7 @@ export class InMemoryLakeStorage implements LakeStorage {
       ?.slice(offset, limit === undefined ? undefined : offset + limit)
 
     for (const row of rows ?? []) {
+      input.signal?.throwIfAborted()
       yield selectColumns(row, input.columns)
     }
   }

package/src/lake-storage/types.ts

@@ -71,6 +71,8 @@ export interface ReadDatasetRowsInput {
   readonly columns?: readonly string[]
   readonly limit?: number
   readonly offset?: number
+  /** Cancel an active read or a read waiting for provider capacity. */
+  readonly signal?: AbortSignal
 }
 
 export interface ReadDatasetChangesInput {

package/src/maintenance/ontology-maintenance.ts

@@ -93,6 +93,7 @@ export class OntologyMaintenance {
 
   /** Runs one coalesced pass. Exposed for deterministic hosting and tests. */
   runNow(): Promise<void> {
+    if (this.stopping) return this.stopping
     this.pass ??= this.runPass().finally(() => {
       this.pass = null
     })
@@ -244,12 +245,15 @@ export class OntologyMaintenance {
       this.timer = null
     }
     const activePass = this.pass ?? Promise.resolve()
-    const stopping = settlesWithin(activePass, this.shutdownTimeoutMs).then((settled) => {
+    const stopping = settlesWithin(activePass, this.shutdownTimeoutMs).then(async (settled) => {
       if (!settled) {
         this.reportError(
-          new Error(`[Sixb] Ontology maintenance did not stop within ${this.shutdownTimeoutMs}ms.`)
+          new Error(
+            `[Sixb] Ontology maintenance is still stopping after ${this.shutdownTimeoutMs}ms; waiting for active storage operations.`
+          )
         )
       }
+      await activePass
     })
     this.stopping = stopping.finally(() => {
       this.stopping = null

package/src/maintenance/types.ts

@@ -7,7 +7,7 @@ export interface OntologyMaintenanceOptions {
   readonly terminalSourceRetentionMs?: number
   /** Maximum deletions attempted per cleanup domain and pass. Defaults to 1,000. */
   readonly cleanupLimit?: number
-  /** Maximum time to wait for an active pass during shutdown. Defaults to 30 seconds. */
+  /** Warn after this shutdown grace period, then wait for active operations. Defaults to 30 seconds. */
   readonly shutdownTimeoutMs?: number
 }
 

package/src/materializer/README.md

@@ -17,7 +17,7 @@ runtime telemetry       -> telemetry.append (origin: telemetry/runtime)
 
 Committed facts are published from the transactional outbox after the commit resolves.
 `OntologyOutboxDispatcher` owns that protocol: ingresses call `notify()` for prompt, non-blocking
-in-process delivery, and a process may call `start()` to host the durable poll loop. Publication is
+in-process delivery; `OntologyMaintenance` hosts recovery catch-up. Publication is
 best effort — delivery may lag, but a committed fact is never lost.
 
 ## Common commit pipeline

package/src/models/definitions.ts

@@ -14,6 +14,10 @@ export interface ModelDefinition {
   readonly modelId: string
   readonly name?: string
   readonly description?: string
+  /** Model author for display; does not change the provider/model routing identity. */
+  readonly publisher?: { readonly id: string; readonly name: string }
+  /** Hosting service label, when the model is offered through an intermediary. */
+  readonly via?: string
   readonly family?: string
   readonly tags?: readonly string[]
   readonly releaseDate?: string
@@ -38,6 +42,17 @@ export function defineLanguageModel(definition: LanguageModelDefinition): Langua
   assertModelId(definition.modelId, "modelId")
   assertOptionalString(definition.name, "name")
   assertOptionalString(definition.description, "description")
+  assertOptionalString(definition.via, "via")
+  if (definition.via !== undefined && !definition.via.trim())
+    throw new TypeError("[Sixb] Model via must not be empty.")
+  const publisher = definition.publisher
+  if (publisher !== undefined) {
+    assertRecord(publisher, "publisher")
+    for (const [field, value] of Object.entries({ id: publisher.id, name: publisher.name })) {
+      if (typeof value !== "string" || !value.trim() || value !== value.trim())
+        throw new TypeError(`[Sixb] Model publisher.${field} must be a nonempty trimmed string.`)
+    }
+  }
   assertOptionalString(definition.family, "family")
   assertOptionalString(definition.releaseDate, "releaseDate")
   assertOptionalString(definition.knowledgeCutoff, "knowledgeCutoff")
@@ -52,6 +67,10 @@ export function defineLanguageModel(definition: LanguageModelDefinition): Langua
     modelId: definition.modelId,
     ...(definition.name === undefined ? {} : { name: definition.name }),
     ...(definition.description === undefined ? {} : { description: definition.description }),
+    ...(publisher === undefined
+      ? {}
+      : { publisher: Object.freeze({ id: publisher.id, name: publisher.name }) }),
+    ...(definition.via === undefined ? {} : { via: definition.via }),
     ...(definition.family === undefined ? {} : { family: definition.family }),
     ...(tags === undefined ? {} : { tags }),
     ...(definition.releaseDate === undefined ? {} : { releaseDate: definition.releaseDate }),

package/src/models/pricing.ts

@@ -335,8 +335,12 @@ function partitionInputUsage(usage: ModelUsage, rateCard: LanguageModelRateCard)
     ...(rateCard.cacheReadInput === undefined ? {} : { cacheRead }),
     ...(hasSpecificWrites
       ? {
-          cacheWrite5m: usage.cacheWrite5mInputTokens ?? 0,
-          cacheWrite1h: usage.cacheWrite1hInputTokens ?? 0,
+          ...(rateCard.cacheWriteInput5m !== undefined || rateCard.cacheWriteInput !== undefined
+            ? { cacheWrite5m: usage.cacheWrite5mInputTokens ?? 0 }
+            : {}),
+          ...(rateCard.cacheWriteInput1h !== undefined || rateCard.cacheWriteInput !== undefined
+            ? { cacheWrite1h: usage.cacheWrite1hInputTokens ?? 0 }
+            : {}),
         }
       : rateCard.cacheWriteInput === undefined
         ? {}

package/src/storage/connector-connections/in-memory.ts

@@ -413,6 +413,20 @@ export class InMemoryConnectorConnectionStorage implements ConnectorConnectionSt
     return structuredClone(finished)
   }
 
+  async listPendingConnectionRuns(
+    input: Parameters<ConnectorConnectionStorage["listPendingConnectionRuns"]>[0]
+  ): Promise<readonly ConnectorConnectionRunRecord[]> {
+    return [...this.connectionRuns.values()]
+      .filter(
+        (run) =>
+          run.projectId === input.projectId &&
+          run.connectorId === input.connectorId &&
+          (run.status === "running" ||
+            (run.status === "waiting" && run.waitingFor === "account_selection"))
+      )
+      .map((run) => structuredClone(run))
+  }
+
   async getConnectionRun(
     input: GetConnectorConnectionRunInput
   ): Promise<ConnectorConnectionRunRecord | null> {
@@ -855,7 +869,7 @@ export class InMemoryConnectorConnectionStorage implements ConnectorConnectionSt
     input: PutConnectorConnectionInput,
     now: Date
   ): PutConnectorConnectionResult {
-    let authorization = this.authorizations.get(input.authorizationId)
+    const authorization = this.authorizations.get(input.authorizationId)
     if (
       !sameAuthorizationScope(authorization, input) ||
       !isSelectable(authorization.status) ||
@@ -863,20 +877,6 @@ export class InMemoryConnectorConnectionStorage implements ConnectorConnectionSt
     ) {
       throw authorizationConflict()
     }
-    if (
-      authorization.status === "pending_selection" &&
-      authorization.selectionExpiresAt!.getTime() <= now.getTime()
-    ) {
-      authorization = {
-        ...authorization,
-        status: "revocation_pending",
-        selectionExpiresAt: undefined,
-        revision: authorization.revision + 1,
-        updatedAt: now,
-      }
-      this.authorizations.set(authorization.id, authorization)
-      throw authorizationConflict()
-    }
     const account = authorization.accounts.find((candidate) => candidate.id === input.account.id)
     if (!account) {
       throw new ConnectorConnectionStorageError(
@@ -1078,6 +1078,7 @@ export class InMemoryConnectorConnectionStorage implements ConnectorConnectionSt
     const run = this.connectionRuns.get(runId)
     if (!run || (run.status !== "waiting" && run.status !== "running")) return run
 
+    if (run.status === "waiting" && run.waitingFor === "account_selection") return run
     const now = this.now()
     if (run.expiresAt.getTime() > now.getTime()) return run
 
@@ -1086,9 +1087,6 @@ export class InMemoryConnectorConnectionStorage implements ConnectorConnectionSt
       if (attempt) this.attempts.delete(attempt.id)
     }
     if (run.status === "waiting") {
-      if (run.kind === "connect" && run.waitingFor === "account_selection") {
-        this.markPendingAuthorizationForCleanup(run.connectorId, run.authorizationId, now)
-      }
       const expired = expireConnectionRun(run, now)
       this.connectionRuns.set(run.id, expired)
       return expired

package/src/storage/connector-connections/provider/connections.ts

@@ -165,7 +165,7 @@ export class DurableConnectorConnections extends ConnectorConnectionOperations {
     input: PutConnectorConnectionInput,
     now: Date
   ): Promise<PutConnectorConnectionResult | CommittedConnectorConnectionError> {
-    let authorization = await persistence.getAuthorization(input.authorizationId)
+    const authorization = await persistence.getAuthorization(input.authorizationId)
     if (
       !authorization ||
       !isSelectable(authorization.status) ||
@@ -173,20 +173,6 @@ export class DurableConnectorConnections extends ConnectorConnectionOperations {
     ) {
       throw authorizationConflict()
     }
-    if (
-      authorization.status === "pending_selection" &&
-      authorization.selectionExpiresAt!.getTime() <= now.getTime()
-    ) {
-      authorization = {
-        ...authorization,
-        status: "revocation_pending",
-        selectionExpiresAt: undefined,
-        revision: authorization.revision + 1,
-        updatedAt: now,
-      }
-      await persistence.updateAuthorization(authorization)
-      return { error: authorizationConflict() }
-    }
     const account = authorization.accounts.find((candidate) => candidate.id === input.account.id)
     if (!account) {
       throw new ConnectorConnectionStorageError(

package/src/storage/connector-connections/provider/runs.ts

@@ -360,6 +360,12 @@ export class DurableConnectorConnectionRuns extends ConnectorConnectionOperation
     })
   }
 
+  listPendingConnectionRuns(
+    input: Parameters<ConnectorConnectionStorage["listPendingConnectionRuns"]>[0]
+  ) {
+    return this.read(input, (persistence) => persistence.listPendingConnectionRuns())
+  }
+
   getConnectionRun(
     input: GetConnectorConnectionRunInput
   ): Promise<ConnectorConnectionRunRecord | null> {