Bump version to 0.1.0-RC.10 [skip ci]

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-   qqq-orb: kingsrook/qqq-orb@0.6.9
+   qqq-orb: kingsrook/qqq-orb@0.6.8
 
 commands:
    configure-package-install:

AGENTS.md

@@ -29,8 +29,6 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
 
 ## Modules
 
-- `qbit-assistant-provider-api`: standalone provider SPI/value types and `ModelPricing`, all exclusively in `com.kingsrook.qbits.assistant.spi`; only Jackson annotations in production. Provider validation takes unresolved `ProviderSettings`, not an entity.
-
 - `qbit-assistant` (`com.kingsrook.qbits.assistant`):
   - `AssistantQBitProducer`, `AssistantQBitConfig` (with `AssistantModelRouting` and `AssistantBudgets`), `AssistantRuntime`, `AssistantSecurity`.
   - `metadata/`: tables, owner key type, the Assistant app (home + main tables in the nav), the retention process, the settings customizer (key-reference checks, masked key status), and the `assistant.admin` custom permission checker.
@@ -39,7 +37,7 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
   - `persistence/AssistantStore`: the **only** code that calls QQQ data actions, and only on the QBit's own tables, under the user's session.
   - `engine/`: `TurnEngine` (the loop), `ContextBuilder` (cache-prefix order), `SystemPrompt`, `PolicyService` (policy row, budgets), `RateLimiter`, the `TurnEvent` / `TurnEventLog` stream, and `MessageParts`.
   - `api/`: `AssistantApi` (transport-free) and `AssistantRouteProvider` (Javalin, SSE).
-  - `provider/`: runtime-backed `RegistryModelProvider`, plus `fake/ScriptedModelProvider` for tests, evals and demos. The SPI lives in `qbit-assistant-provider-api`.
+  - `provider/`: the provider-neutral SPI, plus `fake/ScriptedModelProvider` for tests, evals and demos.
   - `developer/`: the record Developer-screen panel, on the core developer-panel contract.
   - `processes/`: `AssistantRetentionStep` and `TestConnectionProcess` (record action on `assistant_provider`).
   - `engine/ProviderService` (active provider from `assistant_provider` rows, key references, prices), `UsageRecorder` (one `assistant_usage` row per model call), `ConnectionTest`.
@@ -48,8 +46,6 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
 - `qbit-assistant-provider-bedrock`: Claude through the Anthropic Bedrock backend, AWS default credentials and SigV4; IRSA/web-identity hosts supply STS.
 - `qbit-assistant-provider-vertex`: Claude through the Anthropic Vertex backend and Gemini through OpenAI-compatible Chat Completions, with refreshed Google ADC tokens.
 
-- `qbit-assistant-rag-pgvector`: JDBC vector storage; depends on the runtime RAG interfaces (`VectorStore`, `ChunkVector`).
-
 ## Invariants (do not break)
 
 - **Sessions:**
@@ -97,4 +93,4 @@ QQQ style:
 - `develop` publishes SNAPSHOTs.
 - `release/*` publishes RCs; the orb bumps `<revision>` in the root POM.
 - `v*` tags publish releases.
-- All seven modules and the parent POM publish. The flatten plugin resolves `${revision}`.
+- All five modules and the parent POM publish. The flatten plugin resolves `${revision}`.

CHANGELOG.md

@@ -1,97 +1,5 @@
 # Changelog
 
-## Unreleased - Transcript redaction
-
-- Tokenize classified PII/PHI in stored messages, tool inputs/results, replay events, pending actions and derived summaries using QQQ secured-data tokens. Preserve eligible model requests and live SSE.
-- Stage content until turn completion, redact split deltas and classify criteria even when no records match; protect assistant logs with a scoped core redactor.
-- Reject proposals whose parameters were redacted; prevent confirmation before turn completion.
-- Read core table-level classification metadata and add secured-data canary tests for storage, audits, logs and in-memory model access.
-- Preserve durable-turn watchdog, supersede, shutdown and restart recovery with turn-scoped transcript redaction; widen token-bearing columns and entity limits, with H2-safe upgrade SQL.
-- Require QQQ 4.1.0-RC.7 (qqq#1182); retain the default audit-history opt-in and avoid duplicated routing headers against current core. RC.7 is released.
-## Unreleased - Foreign keys
-
-- Reference DDL: add the missing foreign keys (conversation tree, usage, data audit,
-  budget accounting, profile skills) with orphan quarantine and their indexes; make
-  `assistant_model.provider_id` `ON DELETE CASCADE`. A Postgres guardrail test fails
-  any declared relation without a foreign key.
-
-## Unreleased - Durable turns
-
-- Renew user-owned run leases with heartbeats, poll cross-replica Stop, enforce
-  hard deadlines, and finalize active runs during graceful shutdown. Recover
-  abandoned runs on replay, active discovery, or the next question.
-- Default to superseding a prior answer in the same conversation. Accept explicit
-  concurrent questions; the per-user cap supersedes the oldest run instead of
-  refusing another question. Per-minute limits and budgets still apply.
-- Add `GET /qqq/v1/assistant/turns/active`, `turn.phase` progress and `startedAt`
-  on `message.start`. Cancel is idempotent and returns HTTP 200.
-- Add the optional `AssistantRunTracker` Jobs tray SPI (no-op by default),
-  pending QQQ core job tracking (#1210).
-- Add the durable-turn schema upgrade; apply it before deploying this runtime.
-  A partial unique index fences duplicate terminal events from concurrent reapers.
-- UI API extension `assistant` 1.2.0 (additive): `turns/active`, the optional
-  `concurrency` on a new turn, 503 `SHUTTING_DOWN`, `turn.phase`,
-  `message.start.startedAt`, cancelReason `SUPERSEDED`. The 429 response stays
-  documented for budgets and per-minute limits; the "answer already in progress"
-  refusal is no longer returned. Cancel keeps 202 documented for older replicas.
-
-## Unreleased - Starter defaults
-
-- Every seed changeset's rollback is empty: a seeded row cannot be told apart from a host's own row with the same name, and Liquibase also rolls back changesets it marked ran, so a name-based undo would delete host data.
-
-- Fix the defaults changelog: every precondition is a portable `sql-check` (the formatted-SQL `table-exists` form failed to parse); the policy, budget and prices are seeded only into empty tables and the profile only when no default exists, so an existing host never changes on deploy. The test now runs the changelog through Liquibase 4.33, including an already configured host and a missing table.
-- The Setup card prices the default model the way calls are costed (registry, price rows, configured prices); "Add rows for every table" reads fresh data-access rows.
-
-- Ship `db/liquibase/qbit-assistant/assistant-defaults.changelog.sql`: insert-only starter rows for the policy, a default profile, four starter skills offered through it, a monthly instance budget (warn, downgrade, stop), current Anthropic prices and a disabled example scheduled task.
-- Add the Setup card to the Assistant home: every configuration table with its state (set up, needs setup, using defaults, optional) and the next step.
-- Add the `assistant_data_access` table action "Add rows for every table", which writes the default access out as editable rows.
-- Add `help/qbit-assistant.yaml` (QQQ help-bundle format) for the app and every assistant table, saying what each table is for and how its rows get created; applied by `AssistantHelp` until core help bundles ship in a release.
-- Guardrail tests: every table is used at runtime, seeded or explained, and has empty-state help; the changelog seeds a fresh schema and the seeded rows change the assistant's behavior.
-
-## Unreleased - X1/Y1
-
-- Add default-off `withRecordHistory(true)` host opt-in: remove only `audit*` on RC.6, or invoke core #1193 audit-read/write-deny support when available. Preserve user permissions and all other channel denials; kof22 does not opt in.
-
-- Register explicit assistant-channel denials on every assistant table, process,
-  report and widget, preserving core security patterns; fail runtime startup
-  when an assistant object is exposed.
-- Bump the assistant UI API extension to 1.1.0 for optional owned-turn attribution
-  on explain-access, and regenerate its OpenAPI contract.
-- Preserve turn attribution in knowledge discovery, RAG reads and explain-access
-  calls; confirm actions retain the original turn and scheduled runs retain the task.
-- Build audit links with the presentation filter-link builder, filtering by
-  record, table and channel, including deletes; widen audit link storage to TEXT.
-  Document the host audit migration and the QBit column widening.
-- Verify the admin denial matrix through the real invoker and Next UI, startup
-  failures, and confirmed-write human/channel attribution with decoded audit links.
-## Unreleased - Email
-
-### Changed
-
-- Switch scheduled-result email delivery to qbit-email 0.1.0-RC.2's published `com.kingsrook.qbits.email.api` package, preserving templates, categories, idempotency keys, linked records and status mapping.
-- Add optional qbit-email 0.1.0-RC.1 delivery of a scheduled task's result (`AssistantEmail.sendScheduledResult`): template `assistant_scheduled_result`, link-only secure message for results above PUBLIC using core's `DataClassification`, owner-recipient hook, opt-in and `emailExternalApproved` gates. Scheduled-task wiring remains a separate integration step.
-
-## Unreleased - Provider API extraction (#30)
-
-- **BREAKING:** move all 23 provider API types, including `ModelPricing`, to `com.kingsrook.qbits.assistant.spi`. Recompile consumers with the new imports; see UPGRADE.md. Enforce exclusive package ownership and API dependency boundaries with ArchUnit.
-
-- Extract provider SPI/value types and `ModelPricing` into `qbit-assistant-provider-api`, now exclusively in `com.kingsrook.qbits.assistant.spi`. Its only production dependency is Jackson annotations.
-- Move Anthropic, OpenAI, Bedrock and Vertex main dependencies to the API; retain runtime fixtures in test scope. Pgvector still needs runtime RAG interfaces.
-- Provider-specific validation now takes unresolved `ProviderSettings` instead of `AssistantProvider`; add an ArchUnit boundary and standalone coverage gates.
-## Unreleased - P-g
-
-- Add admin Scheduled tasks, owner-locked run history, Quartz cron/timezones,
-  and a 60-second QQQ scheduled process using the host's scheduler context.
-- Log in through the loopback UI API with a separately allow-listed credential
-  environment reference; verify the designated user before starting a normal turn.
-- Add Review/Result Approve write mode, Revoke write mode and Run now actions.
-  Approval binds the task definition; scheduled writes always await confirmation.
-- Attribute scheduled UI API requests and tool logs, apply per-run STOP caps,
-  and send optional Alerts notifications to the designated user. HIPAA summaries
-  contain only `see conversation`.
-- Add unique schedule-slot claims, fixed-clock fixture integration tests and
-  additive Postgres DDL. No API routes or provider modules change.
-
 ## Unreleased - P-f
 
 - Add OpenAI-compatible embeddings (including Azure), explicit CHAT/EMBEDDING
@@ -139,7 +47,7 @@
 - Add HIPAA mode, eligible-provider enforcement, AES-256-GCM conversation storage,
   provider diagnostic redaction, and independent PHI conversation retention.
 - Add owner-locked, admin read-only data routing audits and HIPAA status on the home.
-- Classification levels are core's `DataClassification` (the qbit stand-in is removed); the default source reads core AI metadata merged with configuration.
+- Keep QQQ RC.4 compatibility with a classification stand-in and core #1142 adapter seam.
 
 All notable changes to this project are documented here. The format follows Keep a Changelog, and versions follow semantic versioning.
 
@@ -157,11 +65,6 @@ Phase 0/1 of the QQQ Assistant: read-only Q&A and navigation. Requires QQQ 4.1 w
 - the AI tool kernel (`qqq-backend-core` `actions.ai`, QRun-IO/qqq#1078)
 - the developer-panel contract (QRun-IO/qqq#1076).
 
-### Changed (0.1.0-RC.7, needs QQQ with QRun-IO/qqq#1128)
-- The assistant's endpoints are spec'd `/qqq/v1` operations (UI API extension `assistant` 1.0.0, prefix `/assistant`): same URLs, bodies and statuses, now in the served OpenAPI; turns and events are `text/event-stream`. The raw routes are gone.
-- Tools call core's `UiApiInvoker` with the caller's own request credentials (`UiApiCredentials`); the loopback stand-in is removed. The assistant's own operations are never invocable by its tools.
-- The OpenAPI fragment is committed (`openapi/qqq-v1/assistant.yaml`) and contract-tested.
-
 ### Changed (0.1.0-RC.6): tools go through the UI API (owner decision 2026-10-13)
 - **Every data tool runs a spec'd `/qqq/v1` operation with the user's own session** (`UiApiGateway`, loopback HTTP with the `sessionUUID` cookie): the same authentication, permissions, record locks, validation, audit and errors as the UI. A user without a permission gets the identical denial through the assistant. `navigate` and `search_help` (no records) stay on the core kernel. `LoopbackUiApiGateway` is a stand-in for core's `UiApiInvoker` (QRun-IO/qqq#1128).
 - Tools: `list_tables`, `describe_table`, `query_records`, `count_records`, `get_record`, `search_records`, `render_widget`, `get_record_history`, and new **`create_record`, `update_record`, `delete_record`**.

CLAUDE.md

@@ -29,8 +29,6 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
 
 ## Modules
 
-- `qbit-assistant-provider-api`: standalone provider SPI/value types and `ModelPricing`, all exclusively in `com.kingsrook.qbits.assistant.spi`; only Jackson annotations in production. Provider validation takes unresolved `ProviderSettings`, not an entity.
-
 - `qbit-assistant` (`com.kingsrook.qbits.assistant`):
   - `AssistantQBitProducer`, `AssistantQBitConfig` (with `AssistantModelRouting` and `AssistantBudgets`), `AssistantRuntime`, `AssistantSecurity`.
   - `metadata/`: tables, owner key type, the Assistant app (home + main tables in the nav), the retention process, the settings customizer (key-reference checks, masked key status), and the `assistant.admin` custom permission checker.
@@ -39,7 +37,7 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
   - `persistence/AssistantStore`: the **only** code that calls QQQ data actions, and only on the QBit's own tables, under the user's session.
   - `engine/`: `TurnEngine` (the loop), `ContextBuilder` (cache-prefix order), `SystemPrompt`, `PolicyService` (policy row, budgets), `RateLimiter`, the `TurnEvent` / `TurnEventLog` stream, and `MessageParts`.
   - `api/`: `AssistantApi` (transport-free) and `AssistantRouteProvider` (Javalin, SSE).
-  - `provider/`: runtime-backed `RegistryModelProvider`, plus `fake/ScriptedModelProvider` for tests, evals and demos. The SPI lives in `qbit-assistant-provider-api`.
+  - `provider/`: the provider-neutral SPI, plus `fake/ScriptedModelProvider` for tests, evals and demos.
   - `developer/`: the record Developer-screen panel, on the core developer-panel contract.
   - `processes/`: `AssistantRetentionStep` and `TestConnectionProcess` (record action on `assistant_provider`).
   - `engine/ProviderService` (active provider from `assistant_provider` rows, key references, prices), `UsageRecorder` (one `assistant_usage` row per model call), `ConnectionTest`.
@@ -48,18 +46,14 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
 - `qbit-assistant-provider-bedrock`: Claude through the Anthropic Bedrock backend, AWS default credentials and SigV4; IRSA/web-identity hosts supply STS.
 - `qbit-assistant-provider-vertex`: Claude through the Anthropic Vertex backend and Gemini through OpenAI-compatible Chat Completions, with refreshed Google ADC tokens.
 
-- `qbit-assistant-rag-pgvector`: optional host-supplied JDBC vector store, isolated by instance schema; depends on runtime RAG interfaces (`VectorStore`, `ChunkVector`), with no QQQ RDBMS internals.
+- `qbit-assistant-rag-pgvector`: optional host-supplied JDBC vector store, isolated by instance schema; no QQQ RDBMS internals.
 
 ## Invariants (do not break)
 
-- **Transcript redaction:** stored transcripts never contain raw PII/PHI values; tokens via `ClassifiedValueTokens`. Redact storage copies before truncation/encryption; eligible model inputs and live SSE remain unchanged.
-
 - **Sessions:**
-  - Scheduled runs log in as the designated user through `POST /qqq/v1/manageSession`; resolve only its returned UUID, verify the user id, and never construct or elevate a session. The QQQ-supplied scheduler context touches only assistant bookkeeping.
   - Never use `QSystemUserSession` or construct a `QSession` in main code (ArchUnit).
   - Every route uses `ExecutorSessionUtils.setupSession` (the user's own session).
   - `AssistantSecurity` only ever adds the user's OWN id key, or the all-access key for `assistant.admin` holders.
-- **Channel wall:** every `assistant_*` object (table, process, report and widget) is denied to the `assistant` channel; startup fails otherwise. Requests carry `assistant/<turnId>` or `assistant/scheduled/<taskId>`; administration uses `next-ui`.
 - **Data access:**
   - The vector index stores no record content: only source/table/key/field/chunk, content hash and embedding. Retrieval re-reads every hit through the UI API as the asking user, then applies the existing get_record exposure/masking path.
   - Only `persistence/` calls QueryAction, InsertAction and the other data actions (ArchUnit).
@@ -73,8 +67,6 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
   - Errors (DENIED, NOT_FOUND, INVALID_INPUT, ERROR) are `is_error` results.
   - Unknown tools and over-limit calls also get error results.
 - **Keys:** never stored in a table. `assistant_provider.apiKeyEnvName` holds only an allowed environment variable NAME; `apiKeyStatus` is computed on read (last 4 at most) and stripped on save.
-  - Scheduled task `credentialEnvName` is a separately allow-listed environment variable NAME. Tokens never enter rows, model context or logs. `credentialStatus` is computed and stripped on save.
-  - Scheduled write approval is invalidated by changes to prompt, run-as user, credential reference, profile or write request. Scheduled writes always require the designated user's panel confirmation.
 - **Logging:** never log message content, prompts, tool results or keys. Structured end-of-turn log only.
 - **Thinking:** thinking is never streamed or stored. The Anthropic adapter keeps the raw assistant message (with signatures) only in memory, as `providerState`, for the tool loop.
 - **Links:** only `/app` or `/app/...` hrefs are emitted (`TurnEngine.isAppHref`).
@@ -110,4 +102,4 @@ QQQ style:
 - `develop` publishes SNAPSHOTs.
 - `release/*` publishes RCs; the orb bumps `<revision>` in the root POM.
 - `v*` tags publish releases.
-- All seven modules and the parent POM publish. The flatten plugin resolves `${revision}`.
+- All six modules and the parent POM publish. The flatten plugin resolves `${revision}`.

README.md

@@ -4,82 +4,13 @@ An in-app AI assistant for any QQQ application. The user asks a question in a ch
 
 Design spec: `QRun-IO/qqq` `docs/specs/2026-10-11-qqq-assistant-qbit-design.md`.
 
-## Modules
-
 | Artifact | What it is |
 |---|---|
-| `com.kingsrook.qbits:qbit-assistant-provider-api` | Provider SPI, connection settings, messages, usage and pricing types; only Jackson annotations at runtime. |
-| `com.kingsrook.qbits:qbit-assistant` | The QBit: conversation tables, turn engine, `/qqq/v1/assistant` routes (JSON + Server-Sent Events), budgets, kill switch, the provider registry, and a scripted provider for tests and demos. |
+| `com.kingsrook.qbits:qbit-assistant` | The QBit: conversation tables, turn engine, `/qqq/v1/assistant` routes (JSON + Server-Sent Events), budgets, kill switch, the provider SPI, and a scripted provider for tests and demos. |
 | `com.kingsrook.qbits:qbit-assistant-provider-anthropic` | The Claude provider (`com.anthropic:anthropic-java`). Add it to use Claude. The core QBit has no LLM SDK dependency. |
-| `com.kingsrook.qbits:qbit-assistant-provider-openai` | OpenAI-compatible chat and embedding providers. |
-| `com.kingsrook.qbits:qbit-assistant-provider-bedrock` | Claude through AWS Bedrock. |
-| `com.kingsrook.qbits:qbit-assistant-provider-vertex` | Claude and Gemini through Google Vertex AI. |
-| `com.kingsrook.qbits:qbit-assistant-rag-pgvector` | JDBC vector store; retains the runtime dependency for `VectorStore` and `ChunkVector`. |
-
-### Implementing a provider outside qbit-assistant
-
-Depend on `com.kingsrook.qbits:qbit-assistant-provider-api` at the same version as
-QBit Assistant, and implement `AssistantModelProvider` and optionally
-`AssistantProviderType`. No assistant runtime dependency is needed. All API types, including
-`ModelPricing`, live exclusively in `com.kingsrook.qbits.assistant.spi`. External
-consumers such as qbit-marketing allow that package in their G1 guardrails;
-qbit-bom will add it to the G1 defaults. See [migration imports](UPGRADE.md#provider-api-extraction-30).
-`AssistantProviderType.validate(ProviderSettings)` receives unresolved settings
-(including `apiKeyEnvName`), without a database entity or resolved credentials.
-Hosts register providers through `AssistantQBitConfig` in `qbit-assistant`.
 
 Data tools use the QQQ UI API (`/qqq/v1`) with the signed-in user's session. The UI API enforces permissions and record locks; assistant data-access policy and field exposure can only narrow access. Only record-free navigation and help use the core AI tool kernel. Every tool result reaches the model wrapped as untrusted data.
 
-## Transcript privacy
-
-QQQ **4.1.0-RC.7** supplies the secured-data tokens and log hook (`qqq#1182`).
-Stored transcripts never contain the raw PII/PHI values read by a turn or supplied
-in classified tool criteria/fields. Messages, tool logs, replay events, knowledge
-snippets and pending payloads store `ClassifiedValueTokens` tokens; scheduled
-summaries use the redacted message. The model and live user stream retain the
-values permitted by PHI routing. History and replay show tokens instead.
-
-Content is finalized at turn completion; interrupted servers leave value-free
-placeholders. Proposals requiring redacted parameters are rejected and must be
-completed in the application. Existing transcripts are not migrated. See
-[transcript redaction](docs/DESIGN.md#transcript-redaction-secured-data-15).
-The dependency upgrade stays draft until RC.7 is published; local verification:
-
-```powershell
-.\mvnw.cmd -q verify "-Dqqq.snapshot.version=4.1.0-RC7PRE-SNAPSHOT"
-```
-
-## Host audit attribution (X1/Y1)
-
-Use QQQ **4.1.0-RC.6 or later**. The QBit explicitly denies every assistant
-configuration table, process, report and widget to the `assistant` channel;
-runtime initialization fails if an assistant object is exposed. The same human
-can still administer it through Next UI (`next-ui`). Core's security-surface
-deny patterns remain in place.
-
-Enable the audit client field in the host's core audit provider **after adding
-the backing column**:
-
-```java
-new AuditsMetaDataProvider().withClientChannelField(true)
-   .defineAll(qInstance, backendName, null);
-```
-
-Add nullable `audit.client_channel VARCHAR(100)` using the host's migration and
-column-naming conventions. For kof22 this requires a feature-named changeset
-under `changesets/features/`; this QBit does not migrate the host's audit table.
-The actor remains the signed-in human; `clientChannel` distinguishes
-`assistant/<turnId>`, `assistant/scheduled/<taskId>` and `next-ui`.
-
-Apply the X1/Y1 DDL in [UPGRADE.md](UPGRADE.md) to widen the existing
-`assistant_tool_call.audit_href` column to TEXT for encoded filters.
-Successful record writes store `assistant_tool_call.auditHref` as an `/app/audit`
-filter link over `recordId`, `auditTable.name` and `clientChannel`. The human
-opens this link with their UI permissions; the assistant cannot read audits by
-default. Without the audit channel field, the QBit leaves `auditHref` empty.
-Confirmed scheduled actions use their original turn id when the human approves.
-
-
 ## RAG setup
 
 Knowledge retrieval is optional. The vector index stores **no record content**:
@@ -192,15 +123,6 @@ The key never goes in config, tables or logs. It lives in the application's secr
 
 The provider's `toString` never contains the key. Its errors carry only the HTTP status and the API error type.
 
-### Starter defaults
-
-Include `db/liquibase/qbit-assistant/assistant-defaults.changelog.sql` (shipped in
-the jar) after your assistant DDL. A new installation then has a policy row, a
-default profile with four starter skills, a $50/month instance budget, current
-Anthropic prices and a disabled example scheduled task. Every row is insert-only,
-so administrators can edit them freely. The home's **Setup** card shows what is
-set up and the next step for the rest (usually: add a provider).
-
 ## Provider settings (the Providers table)
 
 Admins set up providers on the **Providers** screen (`assistant_provider`), a standard QQQ table:
@@ -266,8 +188,6 @@ The nav lists the home and the main tables: **Providers**, **Conversations**, **
 | `providerTestTimeoutSeconds` | 30 | How long Test connection waits for the model. |
 | `homeMaxRows` | 20000 | Rows per table the app home reads for its period; it says when totals are partial. |
 | `tablePathPrefix` | `/app` | The front of the links the app home makes to tables and records. |
-| `emailExternalApproved` | `false` | Stands in for the EXTERNAL approval rule (not built yet): scheduled-task result email is sent only when `true`. |
-| `emailRecipientResolver` | owner id if it is an address | Hook: task owner user id to email address. |
 
 At runtime, an admin can override the kill switch, the main model and effort, and the budgets in the single **`assistant_policy`** row.
 
@@ -526,30 +446,12 @@ engine/tool golden turns. No cloud credentials or live endpoints are required.
 Apache 2.0.
 
 
-## Email through qbit-email
-
-When the optional [qbit-email](https://github.com/QRun-IO/qbit-email) is on the classpath **and** produced in the instance, a finished scheduled-task run can be emailed to its owner. Without it nothing changes: `AssistantEmail.sendScheduledResult` returns `NOT_AVAILABLE`. The dependency is `optional`; every reference to it is in `AssistantEmailSender`.
-
-This integration uses qbit-email **0.1.0-RC.2** through its published `com.kingsrook.qbits.email.api` package. Scheduled tasks (P-g) are available, but the runner does not yet wire email delivery. Hosts can call `AssistantEmail.sendScheduledResult(qInstance, config, new ScheduledResultNotice(...))` after a run, supplying its owner, classification, absolute run link and explicit opt-in as `emailResult`. Persisting a task-level email opt-in and wiring the runner remain a separate integration step.
-
-Gates, in order (each returns a status and queues nothing):
-1. the task opted in (`NOT_REQUESTED`);
-2. qbit-email is installed (`NOT_AVAILABLE`);
-3. `emailExternalApproved` is `true` (`NOT_APPROVED`). The EXTERNAL approval rule exists only in the spec, so this explicit flag gates it until the rule is built;
-4. a recipient resolves (`NO_RECIPIENT`): `emailRecipientResolver` maps the owner's user id to an address; by default an owner id that already is an address is used.
-
-What is sent, one message per recipient, idempotency key `assistant:scheduled:<run id>`, linked record the run:
-- result classified PUBLIC (or none): template `assistant_scheduled_result` (NOTIFICATION, Markdown, registered on first send and never overwritten) with the task name, run time, a summary cut to 280 characters and a link to the run. The full model output is never emailed;
-- result classified above PUBLIC (core's `DataClassification`): only the link, through qbit-email's `email_secure_message` pattern. No task name, summary or output.
-
-The outbox result maps to `QUEUED`, `DUPLICATE`, `SUPPRESSED` or `REFUSED` (for example a link that is not absolute http(s)). Addresses and bodies are never logged.
-
 ## Data classification and HIPAA mode
 
-Classify application tables and fields in core's AI metadata (`AiTableMetaData` / `AiFieldMetaData`, QQQ 4.1.0-RC.6), or in the host configuration (a configured value wins when both are set):
+On QQQ 4.1.0-RC.5, classify application tables/fields in the host configuration:
 
 ```java
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
 
 AssistantQBitConfig config = new AssistantQBitConfig()
    .withDataClassification("patient", DataClassification.PHI)
@@ -567,8 +469,8 @@ The existing server-side `withSecretResolver` hook also resolves this reference.
 Startup validates the key. HIPAA mode defaults off; encryption can also be enabled
 with the key reference while HIPAA mode is off.
 
-The levels are core's `DataClassification` (PUBLIC < CONFIDENTIAL < PII < PHI); the
-qbit's former stand-in enum is gone. Unconfigured tables default to PUBLIC; a field
+The qbit `DataClassification` enum is a stand-in for core QRun-IO/qqq#1142, with
+PUBLIC < CONFIDENTIAL < PII < PHI. Unconfigured tables default to PUBLIC; a field
 falls back to its table unless explicitly overridden. A field subset uses its
 selected fields; unrestricted reads and record page contexts use the highest
 classification across the table and its fields. Returned columns and record-label
@@ -577,9 +479,10 @@ explicitly if the host considers it safe for that subset. Cross-table results wi
 tables use the highest classification anywhere. Metadata-only tools remain PUBLIC.
 The assistant's own tables remain denied to tools.
 
-The default `ClassificationSource` reads core's metadata (`AiDataClassifications`,
-`AiTableMetaData`, `AiFieldMetaData`) merged with the configured map; configuration
-wins when both are set. Hosts can still supply `withClassificationSource(ClassificationSource)`.
+Hosts can supply `withClassificationSource(ClassificationSource)` instead. When
+upgrading to an RC containing core #1142, implement that interface with
+`AiDataClassifications`/`AiTableMetaData`/`AiFieldMetaData` (map enum names), then
+replace the stand-in once the qbit's minimum core version includes it.
 
 PHI is sent only to a persisted provider row explicitly marked `hipaaEligible`.
 Every model dispatch rechecks eligibility, including calls after tools and strict
@@ -648,45 +551,6 @@ health is probed when unknown/stale with a two-second timeout. Provider cards sh
 health and down-until, failures show fallback totals, and turn records show the
 route and final destination. See [UPGRADE.md](UPGRADE.md) for the additive schema.
 
-## Scheduled tasks
-
-Administrators configure recurring prompts in **Assistant → Scheduled tasks**.
-Tasks use Quartz cron syntax (for example `0 0 8 * * ?`) and an IANA timezone
-(for example `America/Chicago`; default `UTC`). Tasks start disabled.
-
-```java
-config.withUiApiBaseUrl("http://127.0.0.1:8000")
-   .withScheduledTasksSchedulerName("hostScheduler")
-   .withAllowedScheduledCredentialEnvNames(Set.of("ASSISTANT_SCHEDULED_TOKEN"));
-```
-
-Provide a long-lived access token accepted by the host's authentication provider
-in that environment variable. Store only its **name** on the task and set
-`runAsUserId` to the corresponding QQQ user id. The runner posts the token to
-`/qqq/v1/manageSession`, reads its session cookie and verifies the returned
-session's user before starting a new conversation. No system session reads user
-data. Configure the loopback URL at startup; a scheduled job cannot rely on a
-browser having visited first.
-
-For kof22, provision a designated Authentik account with the intended application
-permissions, obtain a token that kof22's QQQ authentication provider accepts as an
-`accessToken`, and inject it through the existing secret-manager/ExternalSecret
-pipeline. An Authentik management API token is suitable only if the host's auth
-adapter explicitly accepts it. Rotate the token in the secret manager, never in
-the task table. This feature does not provision an account or token.
-
-**Run now**, **Approve write mode** and **Revoke write mode** are Review/Result
-record actions. Write approval names the designated user and displays the exact
-prompt SHA-256. Changing prompt, user, credential reference, profile or write-mode
-request clears approval. Scheduled writes always wait for that user's panel
-confirmation, even if normal policy disables confirmation.
-
-Each run keeps an owner-locked audit row and a normal conversation. RECORD adds
-no notification; NOTIFICATION and BOTH also notify the designated user through
-the optional Alerts QBit SPI. Without Alerts, notification delivery is log-only.
-HIPAA summaries are always `see conversation`. Cost caps stop at dispatch
-boundaries, so the last completed call can cross the cap; no further call starts.
-Apply the [P-g migration](UPGRADE.md#p-g-scheduled-tasks) before enabling jobs.
 ### Answer presentation
 
 The always-available `present_results` tool turns retrieved results into metrics,
@@ -699,29 +563,3 @@ skills can extend the built-in presentation instructions. See the
 The image-breakdown golden task also runs in the existing opt-in live provider suite:
 `./mvnw verify -Dassistant.live=true -Dtest.excludedGroups= -Dgroups=live -Djacoco.skip=true -pl qbit-assistant-provider-anthropic -am`
 (with `ANTHROPIC_API_KEY` set). Live calls are excluded from normal verification.
-
-### Record history and the assistant channel
-
-Core's default `ClientChannelsMetaData` denies `audit*` to the `assistant`
-channel. Accordingly, `get_record_history` is offered only when all three audit
-tables it queries (`auditTable`, `audit`, and `auditDetail`) exist and are not
-channel-denied, including their effective permission rules. A host that intends
-to expose record history can opt in during instance configuration:
-
-```java
-new AssistantQBitConfig()
-   .withRecordHistory(true);
-```
-
-This is an owner decision and a hard wall: record history defaults to disabled;
-**kof22 does not opt in**. On QQQ RC.6, the opt-in removes exactly `audit*`
-from the assistant's denied patterns (the former manual configuration step).
-RC.6 does not add a separate channel write denial for audits. On later RCs that
-include QRun-IO/qqq#1193, it calls `withAssistantAuditReads()`, which allows audit
-reads but denies audit writes. The user's own audit permissions still apply.
-Other patterns, including `worm_audit_*`, `assistant_*`, and security surfaces,
-remain untouched, as do explicit object and permission-rule denials.
-
-History visibility uses core's `isDenied` read/all-operation check. RC.6 has no
-operation argument; the later write-only deny patterns must remain separate
-from that check so they do not hide the read tool.

UPGRADE.md

@@ -1,187 +1,5 @@
 # Upgrading qbit-assistant
 
-## Transcript redaction (Unreleased)
-
-Apply the transcript-redaction column widening block in `docs/schema-postgres.sql`
-to existing databases. Stop reasons, request IDs, tool-call IDs, feedback/data-audit/
-budget-override reasons and scheduled-run summaries/errors now use `TEXT`; token
-expansion must not fail a write or truncate secured-data tokens. The corresponding
-entity field limits are removed, including pending-action and tool-result summaries.
-
-## Foreign keys (2026-10-14)
-
-Recommended: apply the "Foreign keys" block at the end of
-`docs/schema-postgres.sql` (after the index audit). It is guarded and safe to re-run.
-- Adds the missing foreign keys across the conversation tables, usage, data audit,
-  budget accounting and profile skills, with the indexes they need.
-- Detail rows of a conversation `CASCADE`; the message/turn cycle, usage and the data
-  audit use `SET NULL`, so usage keeps its cost rows when a conversation is deleted.
-- Usage, budget accounting and the data audit hold their provider (`NO ACTION`):
-  disable a provider with history instead of deleting it.
-- `assistant_model.provider_id` changes from `NO ACTION` to `CASCADE`
-  (constraint renamed `fk_assistant_model_provider`).
-- Rows that point at a missing parent are first copied to `qqq_fk_quarantine`
-  (created if absent), then nulled, or deleted for the `NOT NULL` profile-skill
-  links. Check that table after the upgrade.
-
-No code change.
-
-## Index audit (2026-10-14)
-
-Recommended, not required: apply the "Index audit" block at the end of
-`docs/schema-postgres.sql`. It adds six indexes, every one `IF NOT EXISTS`:
-- usage by turn (read on each scheduled run)
-- the three retention date filters (turn events, tool calls, inactive conversations)
-- the two `ON DELETE SET NULL` foreign keys on `assistant_scheduled_run`
-
-No code change.
-
-## Durable turns (Unreleased)
-
-Apply the **Durable turns** block at the end of `docs/schema-postgres.sql` before
-starting the new runtime. It adds nullable `heartbeat_at`, `lease_owner`,
-`cancel_requested_at`, `phase`, `concurrency_mode` and the `(user_id, status)`
-index. A partial unique index on terminal events also prevents two replicas from
-inserting separate `message.end` frames for the same turn. Check for historical
-duplicate terminal frames before applying it (resolve any duplicates through your
-normal migration process). Fresh installs run the full schema, including ALTERs.
-Existing rows with no heartbeat use `started_at` for lease expiry. During the
-first upgrade from a runtime without heartbeats, drain old replicas' turns first:
-a new replica cannot distinguish an old live turn from a dead owner after 45 s.
-
-Defaults: heartbeat 5 s, lease 45 s, hard duration 300 s, force-finalization grace
-20 s, shutdown grace 8 s. Configure these through the corresponding
-`AssistantQBitConfig` withers. Heartbeat must be shorter than the lease. The JVM
-shutdown hook is enabled by default; tests disable `registerShutdownHook` and
-managed hosts may call `runtime.shutdown(Duration)` themselves. Give the process
-termination budget enough time for the configured shutdown grace and persistence.
-
-`POST /conversations/{id}/turns` accepts `concurrency: "supersede" | "concurrent"`
-(case-insensitive). Default `SUPERSEDE` stops prior runs in that conversation;
-`CONCURRENT` permits them. The default per-user cap is now 3; reaching it stops
-the oldest run instead of returning the old in-progress 429. Per-minute and
-budget 429 responses still apply. Superseded turns record `cancelReason=SUPERSEDED`.
-
-Cancel now returns HTTP **200**, including for terminal turns, with the current
-`status`. The OpenAPI fragment retains the old 202 response for mixed-version
-rollouts. Active runs are discoverable through `GET /qqq/v1/assistant/turns/active`;
-reattach through the existing events route. Consumers should recognize
-`turn.phase` and `message.start.startedAt`. Starts during shutdown return
-503 `SHUTTING_DOWN`; clients may retry against a ready replica.
-
-Hosts may wire `AssistantRunTracker` for Jobs tray publication, progress, Stop,
-and terminal notification. It is a no-op by default and all callbacks are
-isolated from turn execution. Tracking ids are local to the owning runtime;
-reaping an already dead owner does not invent another tracking job. Hosts should
-associate their durable tracking row with the supplied turn id. The SPI is a
-stand-in for QQQ #1210.
-
-## Starter defaults, setup card and table help
-
-The jar now ships `db/liquibase/qbit-assistant/assistant-defaults.changelog.sql`.
-Include it from the host's master changelog **after** the changesets that create
-the `assistant_*` tables:
-
-```yaml
-- include: { file: db/liquibase/qbit-assistant/assistant-defaults.changelog.sql }
-```
-
-It is insert-only and never changes a host that already configured the
-assistant: the policy, the **$50/month instance budget** (warn 80%, downgrade
-100%, stop 120%) and the Anthropic list prices are seeded only into empty tables,
-and the `default` profile only when no default profile exists. Price rows take
-precedence over `AssistantQBitConfig.withPricing`, which is why they are seeded
-only when there are none. The four starter skills and a disabled example
-scheduled task are always added (by name); on a host with its own default
-profile the skills are not linked to it, and the Setup card says so. Requires
-Liquibase 4.x or later (preconditions are `sql-check`s).
-
-No DDL changes. New: the Assistant home's Setup card, the `assistant_data_access`
-table action **Add rows for every table** (`assistantDataAccessAddDefaults`,
-admin only) and bundle help on every assistant table (`help/qbit-assistant.yaml`).
-
-## X1/Y1: channel wall and audit attribution
-
-Requires QQQ 4.1.0-RC.6. Every assistant table, process, report and widget is
-explicitly denied to channel `assistant`; startup rejects an exposed object.
-Host customizations must preserve these denials. Administration uses `next-ui`.
-
-Before enabling `AuditsMetaDataProvider.withClientChannelField(true)`, add the
-nullable `audit.client_channel VARCHAR(100)` column using the host migration
-conventions. kof22 needs a feature changeset under `changesets/features/` (for
-example `2026-10-14-audit-client-channel.sql`); no host migration is applied here.
-Existing audit rows remain null. The test fixture enables the field.
-
-The existing `assistant_tool_call.auditHref` column now points to audit rows
-filtered by record, table and client channel, including for deletes. It is empty
-when the host has not enabled the audit channel field. Apply the X1/Y1 DDL in
-`docs/schema-postgres.sql` to widen the existing `assistant_tool_call.audit_href`
-column to TEXT: encoded filters with long table names or string record ids can
-exceed the old 500-character limit. No new QBit column is required. `GET /assistant/access` accepts an optional owned `turnId` for attribution.
-
-## Provider API extraction (#30)
-
-**BREAKING:** every provider API type now lives in the exclusive package
-`com.kingsrook.qbits.assistant.spi`. Update imports and recompile consumers.
-Hosts still receive `qbit-assistant-provider-api` transitively from `qbit-assistant`.
-No schema migration is needed.
-
-| Old import | New import |
-|---|---|
-| `com.kingsrook.qbits.assistant.provider.X` (API types) | `com.kingsrook.qbits.assistant.spi.X` |
-| `com.kingsrook.qbits.assistant.engine.ModelPricing` | `com.kingsrook.qbits.assistant.spi.ModelPricing` |
-
-Internal classes such as `provider.RegistryModelProvider` and
-`provider.fake.ScriptedModelProvider` stay in the runtime and are not API types.
-External consumers such as qbit-marketing depend only on
-`com.kingsrook.qbits:qbit-assistant-provider-api` for these contracts and allow
-package `com.kingsrook.qbits.assistant.spi` in their guardrails. qbit-bom will add
-this package to the G1 defaults.
-
-External providers and applications using only provider/pricing types should
-replace their `qbit-assistant` dependency with
-`com.kingsrook.qbits:qbit-assistant-provider-api` at the same version. This removes
-the assistant runtime and QQQ from that dependency path; only Jackson annotations
-are required by the API. Anthropic, OpenAI, Bedrock and Vertex adapters use this
-split; pgvector retains `qbit-assistant` for its runtime RAG interfaces.
-
-Recompile custom provider types that override `validate(AssistantProvider)` and
-change the signature to `validate(ProviderSettings)`. The settings carry the
-configured kind, URL, API version, region, project, CA bundle name, timeouts and
-`apiKeyEnvName`; the key and bearer-token supplier are not resolved for validation.
-Providers using the default validator need only the import migration. Keep the runtime and
-provider artifacts on the same version; old validator overrides must be rebuilt.
-## P-g: scheduled tasks
-
-Apply the **P-g** DDL in [docs/schema-postgres.sql](docs/schema-postgres.sql)
-before deploying. The unique `(task_id, scheduled_for)` constraint is required
-for multi-replica safety; retain run rows as schedule-slot claim history.
-Existing conversations default to channel `panel`. Tasks start disabled.
-
-Set `withScheduledTasksSchedulerName(...)` to an existing QQQ scheduler and
-configure `withUiApiBaseUrl(...)` with this replica's own listener URL. The runner
-polls every 60 seconds. QQQ must supply a scheduler session able to manage the
-assistant tables; this QBit never creates that session. The configured backend
-must enforce unique keys atomically (Postgres does).
-
-Allow only designated credential references with
-`withAllowedScheduledCredentialEnvNames(Set.of("ASSISTANT_SCHEDULED_TOKEN"))`.
-Provide that variable through the host's secret manager. It must hold a token
-accepted by the host's `manageSession` authentication provider for `runAsUserId`.
-The runner fails closed on missing/disallowed credentials or an identity mismatch.
-See [scheduled-task setup](README.md#scheduled-tasks) for kof22 provisioning.
-
-QQQ RC.5 has no conditional UpdateInput. The runner uses a database-unique
-schedule-slot insertion as its optimistic claim, then advances `nextRunAt`
-before starting work. Crashes can skip a slot; they never retry it. No ArchUnit
-exception or fabricated session is introduced. Core RC.6 enforces client-channel denials; scheduled requests carry
-`assistant/scheduled/<taskId>`.
-
-Notifications use the optional Alerts QBit notification SPI with a single-user
-audience. Without it, delivery logs run id/status only. All output modes retain
-the owner-locked audit row and conversation. HIPAA run summaries never copy the
-answer; they contain only `see conversation`.
-
 ## P-f: knowledge retrieval
 
 Apply the **P-f** assistant-table DDL in

docs/DESIGN.md

@@ -16,13 +16,6 @@ All of it is in standard QQQ tables with full record screens (D6), prefixed `ass
 
 `assistant_turn` keeps the per-turn totals and `assistant_usage_daily` the budget rollups, as before. `assistant_usage` adds the per-call detail the home needs: the provider, the failures and latency.
 
-## Provider SPI boundary
-
-All provider contracts and value types, including `ModelPricing`, belong exclusively
-to `com.kingsrook.qbits.assistant.spi` in `qbit-assistant-provider-api`. Consumers
-can depend on this artifact alone and allow its package in G1. Runtime provider
-registry and fake implementations remain in their existing internal packages.
-
 ## API keys
 
 Decision: **reference, not storage.** A provider row holds the NAME of an environment variable (`apiKeyEnvName`); `ProviderService` resolves it through `config.getSecretResolver()` (default `System::getenv`) when it builds a client.
@@ -66,7 +59,7 @@ The result goes on the row (`lastTest*`) and into `assistant_usage` (`TEST`), so
 
 ## Cost
 
-`cost = input × in + output × out + cacheRead × read + cacheWrite5m × w5 + cacheWrite1h × w1`, in micro-dollars, rounded up (`com.kingsrook.qbits.assistant.spi.ModelPricing.costMicros`).
+`cost = input × in + output × out + cacheRead × read + cacheWrite5m × w5 + cacheWrite1h × w1`, in micro-dollars, rounded up (`ModelPricing.costMicros`).
 
 Prices come from the `assistant_model_price` row for (type, model). Empty cache prices are 0.1x, 1.25x and 2x the input price. A model without a row uses the `pricing` config map, else costs 0. A price change affects later calls only; each usage row keeps the cost it was recorded with.
 
@@ -150,7 +143,7 @@ Owner: *"the agent should have to go through the same API that the UIUX does. th
 - A request to the server's own port runs the identical pipeline by construction. It costs one local hop, which is milliseconds next to a model call.
 
 This matches core's design (`docs/UI-API-EXTENSIONS.md` §5, `UiApiInvoker`, QRun-IO/qqq#1128).
-- `CoreUiApiGateway` adapts core's `UiApiInvoker` (the loopback stand-in is deleted). It labels calls with the client channel `assistant`, plus the turn id as detail (`assistant/<turnId>`). Form params go to the invoker's `withFormParam`; extra headers (the bulk-load tools' `X-QQQ-AI-Route`) go through `HeaderedUiApiInvoker`, a small subclass in core's package because core's request has no `withHeader` yet. A host can still inject its own gateway with `withUiApiGateway`.
+- `LoopbackUiApiGateway` is the stand-in until a QQQ release has the invoker. Then an adapter over `UiApiInvoker.forServer(server)` replaces it (or a host injects one with `withUiApiGateway`), and nothing else changes.
 - The base URL is `uiApiBaseUrl` if configured. Otherwise it is `127.0.0.1` plus the local port the first assistant request arrived on, so in a multi-replica deployment the call stays on the replica that holds the session's process state.
 
 ### The tools
@@ -235,18 +228,6 @@ The golden and red-team evals now run through the UI API too.
   - Choosing *another* user would need that user's permissions without their session. QQQ core has no API to evaluate another user's permissions, and the assistant never builds or borrows a session. That part waits for a core API, so the report is always computed with the requester's own session.
 - **Recent denials:** the home's "Recent denials" card lists the newest tool calls the UI API, data access or the policy refused, with who, the table, the operation and the HTTP status, or the assistant setting that refused it.
 
-## Spec'd assistant endpoints and the core invoker (phase d, QQQ 4.1.0-RC.6)
-
-- **The endpoints are spec'd `/qqq/v1` operations.** `api/specs/AssistantSpecs` registers the UI API extension `assistant` (semver 1.0.0, established prefix `/assistant`) through `MiddlewareSpecExtensionsMetaData`.
-  - The URLs, bodies and statuses stay the same (201 create, 202 cancel, 204 delete and feedback, and the assistant's `{"error","code"}` errors), so Next needs no change.
-  - They appear in the served `/qqq/v1/openapi.yaml`. The turn and events streams are declared as `text/event-stream`, with `AssistantTurnEventV1` describing the events.
-  - The fragment is committed as `qbit-assistant/src/main/resources/openapi/qqq-v1/assistant.yaml`. `AssistantSpecsContractTest` checks it against the code, and the release baseline in test resources, with core's `UiApiContract`.
-- **No raw routes.** `AssistantRouteProvider` keeps only a before-handler that learns the server's local port from the first `/qqq/v1` request.
-- **Tools call core's `UiApiInvoker`** (`CoreUiApiGateway`), and the loopback stand-in is removed.
-  - The request's credentials (`UiApiCredentials.fromContext`: session cookies, Authorization, API key, exactly as they came in) are captured by the spec that starts the turn, confirms an action or explains access. They are passed to the tools, so OAuth2, table auth and API-key sessions all work. They are never logged.
-  - The gateway also refuses the assistant's own operations, so a turn can never start a turn.
-- QQQ 4.1.0-RC.6 (the default `qqq.snapshot.version`) contains #1128, so no local build is needed.
-
 ## Owner decisions (2026-10-13), continued: write mode, the hard wall, audit attribution, providers
 
 These were added on the same day. All recommendations below are accepted; we adjust once they can be seen working.
@@ -294,14 +275,6 @@ AI exposure NONE is not enough, because the assistant acts as the user and an ad
 - **Tests:** an assistant write produces audit rows with the human actor and `via=assistant/<turnId>`; the same write from the UI produces `via=next-ui`.
 - kof22 needs a feature-named changeset (`changesets/features/...`) for the audit column.
 
-### X1/Y1 as built
-- Record history is an explicit, default-off host opt-in (`withRecordHistory(true)`); kof22 does not opt in. RC.6 removes only `audit*`; later core #1193 support allows audit reads with a write-only denial. Other walls and user audit permissions remain intact.
-- RC.6's invoker fixes the `assistant` channel server-side and ignores spoofed client headers. Turn context survives knowledge discovery, RAG reads, confirm actions and owned-turn explain-access; scheduled calls retain `scheduled/<taskId>`.
-- The producer enumerates assistant tables, processes, reports and widgets (including source-QBit metadata), adds explicit denied-client rules without replacing user permissions, and registers `assistant_*` idempotently. Runtime construction independently validates the wall with core's `isDenied` and fails on exposed objects.
-- The fixture enables core's audit channel field. Hosts must migrate the nullable audit column before enabling it; kof22 needs its own feature changeset.
-- Successful insert/update/delete tool calls link to `/app/audit` with `recordId`, `auditTable.name` and `clientChannel` criteria, using the same encoder as `present_results`. Hosts without the channel field get no audit link. Existing audit link storage widens to TEXT for long encoded filters.
-- HTTP tests enumerate the configuration denial matrix for an admin, contrast Next UI access, reject broken startup metadata, and verify confirmed-write actor/channel plus the decoded audit filter.
-
 ### P. Providers, local models, HIPAA routing, budgets
 1. **Providers and models as data, any number, each with an enabled toggle.**
    - Kinds:
@@ -381,8 +354,10 @@ AI exposure NONE is not enough, because the assistant acts as the user and an ad
 
 ### P-c as built
 
-- The qbit classification stand-in is gone: the levels are core's `actions.ai.DataClassification` (QQQ 4.1.0-RC.6, core #1142).
-  The default `ClassificationSource` reads core metadata (`AiDataClassifications`, `AiTableMetaData`, `AiFieldMetaData`) merged with the configured table/field map; configuration wins when both are set. Hosts can still supply their own source with `withClassificationSource`.
+- The qbit classification enum is a stand-in for core #1142 until a released RC
+  includes it. Configured table/field overrides are the default; hosts can supply
+  a `ClassificationSource` over core metadata, mapping enum names, then replace
+  the stand-in when the minimum QQQ version advances.
 - Turn/page/tool classification is monotonic, persisted on the turn and retained
   on the conversation. Field subsets use overrides; unknown cross-table results
   conservatively use the highest configured level. Metadata tools stay PUBLIC.
@@ -494,92 +469,6 @@ AI exposure NONE is not enough, because the assistant acts as the user and an ad
   per-record pgvector replacement is transactional, while scan reconciliation is
   not a snapshot of concurrently changing application data.
 
-### P-g as built
-
-- `assistant_scheduled_task` is admin-only, AI exposure NONE, and appears as
-  Scheduled tasks. The owner-locked, read-only `assistant_scheduled_run` child
-  list retains run status, accounting and a bounded summary. Conversations gain
-  read-only `scheduledTaskId` and `channel` (`panel` or `assistant/scheduled`).
-  Task and run timestamps use the runtime clock; cron uses Quartz and a validated
-  ZoneId, including DST. Enablement and schedule edits recompute `nextRunAt`.
-- Credentials are references, never stored tokens. `credentialEnvName` must
-  match `[A-Z_][A-Z0-9_]*` and the dedicated
-  `allowedScheduledCredentialEnvNames` allowlist. The existing secret resolver
-  supplies its value. Read-only `credentialStatus` reports presence without
-  exposing token characters and is stripped on every save.
-- A run sends JSON `{accessToken: ...}` to the same loopback base URL's
-  `POST /qqq/v1/manageSession`. RC.5 with HTTP-only cookies returns the UUID in
-  `Set-Cookie: sessionUUID`; legacy JSON `uuid` is also accepted. Only then does
-  the runner resolve that UUID through the host authentication module, exactly
-  the UUID lookup used by the UI request pipeline. No direct token authentication,
-  automated-user session or constructed QSession exists in assistant code.
-  The resolved user id must equal `runAsUserId` before any model call. MOCK in
-  the integration fixture maps test tokens to the existing user-prefix sessions;
-  that token adapter is test code only.
-- kof22 provisions an Authentik designated account with normal QQQ permissions
-  and injects an accepted long-lived token through its secret manager and
-  ExternalSecret into an allow-listed environment variable. The task holds the
-  variable name and QQQ user id. Host authentication must accept that token type
-  as `accessToken`; an Authentik management API token is not automatically an
-  application access token. Neither account nor credential is provisioned here.
-- `assistantScheduledTasksRunner` registers a 60-second QScheduleMetaData when
-  `scheduledTasksSchedulerName` names a host scheduler. QQQ supplies its normal
-  scheduler context for assistant-table bookkeeping; no ArchUnit exception is
-  necessary. Configure `uiApiBaseUrl` at startup. No browser visit is required.
-- **Claim compatibility:** RC.5 UpdateInput cannot express a conditional
-  `WHERE next_run_at = expected`. AssistantStore therefore claims the expected
-  schedule slot using the database-enforced unique `(taskId, scheduledFor)` run
-  key and advances `nextRunAt` before login/dispatch. This is a unique-insert
-  optimistic claim rather than a conditional update. The memory fixture also
-  serializes claim operations on its instance. The database constraint, not
-  that monitor, prevents cross-replica duplicate execution. Do not remove claim
-  history or deploy to a backend without atomic unique keys. A crash can lose a
-  run; it never retries a claimed slot. A later tick advances an already-claimed
-  slot left behind by a crash between claim and schedule update.
-- The unchanged AssistantApi starts a new normal turn under the logged-in
-  designated user, preserving start gates, rate limiting, P-c classification,
-  P-d budgets and P-e routing/fallback. An internal context supplies the task's
-  selected profile and additional cost cap. Cost includes chat, classifier,
-  failed calls and knowledge-query embeddings. STOP is checked at dispatch
-  boundaries; an in-flight call can exceed the cap, and no next call is sent.
-- Every scheduled UI API request, including metadata and knowledge retrieval,
-  carries `X-QQQ-Client: assistant/scheduled/<taskId>`. The only uiapi change is
-  additive `LoopbackUiApiGateway.invokeWithClient`; custom gateways currently
-  fail closed for scheduled requests because their channel contract is unknown.
-  Tool-call rows also record `clientChannel`. Core channel deny enforcement
-  remains pending the client-channel RC; existing AI exposure/data-access
-  restrictions continue to apply on RC.5.
-- Approve write mode, Revoke write mode and Run now are admin record actions
-  using standard streamed ETL Review/Result. Review shows the exact prompt's
-  SHA-256 and run-as user. Result rereads and compares the complete reviewed
-  definition before recording the actual administrator's user id and time.
-  A persisted approval hash additionally binds prompt, run-as user, credential
-  reference, profile and requested mode. Editing any of these clears approval;
-  ordinary saves cannot set approval or computed bookkeeping fields.
-- This base has create/update/delete tools, but no W1 conversation mode/policy
-  switch. Scheduled runs explicitly narrow the existing tool policy: write tools
-  require both request and matching approval, a READ_WRITE table and the policy's
-  allowed-tools list. All scheduled writes require panel confirmation, including
-  when normal policy allows immediate writes. A pending proposal adds a waiting
-  notice to the run summary; the scheduler never confirms it.
-- RECORD keeps the run and conversation; NOTIFICATION and BOTH also submit an
-  Alerts notification with `NotificationAudience.user(runAsUserId)` and an
-  `/app/...` conversation link. Reflection targets the installed Alerts QBit's
-  RC.5 notification SPI/sink, following WebhooksAlerts' optional-dependency
-  pattern. Without it, a log contains run id and status only. Notification text
-  contains no answer data. In HIPAA mode run summaries contain exactly
-  `see conversation`; conversation payloads retain the existing encryption.
-    The existing record URL is an admin-screen link. Non-admin owners can read
-    their scheduled conversations in the panel's conversation list; opening a
-    particular existing conversation from a notification still needs a frontend
-    deep-link contract (the current panel only supports open/new-prompt links).
-    This phase does not broaden existing conversation record-screen permissions.
-- Failures close the run as FAILED or BLOCKED with sanitized errors and wait
-  until the next schedule. All output modes retain their audit record. Tests
-  exercise real manageSession and UI API requests with a fixed clock, designated
-  permissions and owner locks, headers, competing runners, approval invalidation,
-  notification modes, PHI refusal, encrypted HIPAA storage and cost STOP.
-
 ### Phases (each a green PR)
 | | Scope | Depends on |
 |---|---|---|
@@ -637,32 +526,3 @@ The shared golden task asks "How many images do I have by type?": five UI count
 calls establish 81 JPEG, 20 PNG and zero other configured types, then a presentation
 with two rows, 80.2%/19.8% shares, two pie points and working MIME filter links.
 The same task is included in the opt-in `live` Anthropic eval suite.
-
-
-## Transcript redaction (secured data §15)
-
-`TranscriptRedactor` collects classified values from tools using `ClassificationSource`,
-including core table/field metadata. Stored record fields use
-`ClassifiedValueTokens.forRecordField`; criteria/proposals without a record use
-`forContext`. Core selects `shred:v1`, `hmac:v1`, or `changed:v1`. Knowledge snippets
-retain their source field's token. Matching is case-sensitive and includes canonical,
-displayed, escaped, encoded and explicitly truncated variants.
-
-`AssistantStore` stages content in turn memory and writes placeholders until
-finalization, protecting backend writes and their audits. It redacts before truncation
-and encryption. This covers messages, tool/bulk logs, replay events, pending payloads
-and audit reasons; scheduled summaries derive from redacted messages. Model requests
-and live SSE remain unchanged under PHI routing. Persisted text deltas are joined
-before redaction, with the text in the first delta and remaining deltas empty;
-sequence numbers remain stable.
-
-Crashes or unfinished tools at timeout leave placeholders. Proposals remain
-non-executable (`PREPARING`) until finalization; redacted proposals are rejected and
-must be completed in the application. A core `LogRedactorInterface` hook covers all
-threads until the turn and its tool workers finish, then releases the raw values.
-
-History stays redacted; later turns re-read records. Existing transcripts are not
-migrated, and arbitrary text is not inferred to be classified without a matching
-observed value or classified criterion/field. Canary tests scan every assistant table,
-core audits and captured logs, while proving eligible models receive original values.
-Requires QQQ 4.1.0-RC.7 (`qqq#1182`); keep the PR draft until publication.

docs/schema-postgres.sql

@@ -49,7 +49,7 @@ CREATE TABLE assistant_turn
    status VARCHAR(16),
    classification VARCHAR(16),
    classification_tables VARCHAR(500),
-   stop_reason TEXT,
+   stop_reason VARCHAR(64),
    error_code VARCHAR(32),
    cancel_reason VARCHAR(64),
    model VARCHAR(200),
@@ -88,7 +88,7 @@ CREATE TABLE assistant_tool_call
    turn_id INTEGER,
    conversation_id INTEGER,
    user_id VARCHAR(255),
-   tool_call_id TEXT,
+   tool_call_id VARCHAR(128),
    tool_name VARCHAR(64),
    input_json TEXT,
    outcome VARCHAR(16),
@@ -103,7 +103,7 @@ CREATE TABLE assistant_tool_call
    redactions_json TEXT,
    ui_api_operation VARCHAR(255),
    http_status INTEGER,
-   audit_href TEXT,
+   audit_href VARCHAR(500),
    pending_action_id INTEGER,
    create_date TIMESTAMP WITH TIME ZONE
 );
@@ -118,7 +118,7 @@ CREATE TABLE assistant_feedback
    conversation_id INTEGER,
    user_id VARCHAR(255),
    rating INTEGER,
-   reason TEXT,
+   reason VARCHAR(64),
    comment TEXT,
    create_date TIMESTAMP WITH TIME ZONE
 );
@@ -267,7 +267,7 @@ CREATE TABLE assistant_usage
    cache_read_tokens BIGINT,
    cache_write_tokens BIGINT,
    cost_micros BIGINT,
-   request_id TEXT,
+   request_id VARCHAR(100),
    create_date TIMESTAMP WITH TIME ZONE
 );
 CREATE INDEX assistant_usage_create_date ON assistant_usage (create_date);
@@ -310,7 +310,7 @@ CREATE TABLE assistant_pending_action
    conversation_id INTEGER,
    turn_id INTEGER,
    user_id VARCHAR(255),
-   tool_call_id TEXT,
+   tool_call_id VARCHAR(128),
    tool_name VARCHAR(64),
    ui_api_operation VARCHAR(255),
    table_name VARCHAR(128),
@@ -382,7 +382,7 @@ CREATE TABLE assistant_data_audit
    classification VARCHAR(16),
    tables VARCHAR(500),
    decision VARCHAR(16),
-   reason TEXT,
+   reason VARCHAR(1000),
    create_date TIMESTAMP WITH TIME ZONE
 );
 CREATE INDEX assistant_data_audit_user_id ON assistant_data_audit (user_id);
@@ -415,7 +415,7 @@ CREATE TABLE assistant_budget_override
    scope_value VARCHAR(200),
    extra_value NUMERIC,
    unlimited_until TIMESTAMP WITH TIME ZONE,
-   reason TEXT NOT NULL,
+   reason VARCHAR(1000) NOT NULL,
    granted_by VARCHAR(200),
    expires_at TIMESTAMP WITH TIME ZONE NOT NULL,
    create_date TIMESTAMP WITH TIME ZONE,
@@ -524,192 +524,3 @@ CREATE TABLE assistant_rag_source (
 -- );
 -- CREATE INDEX IF NOT EXISTS assistant_rag_chunk_cosine
 --    ON assistant_rag.assistant_rag_chunk USING hnsw (embedding vector_cosine_ops);
-
--- P-g: designated-user scheduled assistant tasks. Install before enabling jobs.
-CREATE TABLE assistant_scheduled_task (
-   id SERIAL PRIMARY KEY,
-   name VARCHAR(200) NOT NULL,
-   enabled BOOLEAN NOT NULL DEFAULT FALSE,
-   prompt TEXT NOT NULL CHECK (char_length(prompt) BETWEEN 1 AND 4000),
-   run_as_user_id VARCHAR(200) NOT NULL,
-   credential_env_name VARCHAR(200) NOT NULL,
-   credential_status VARCHAR(200), -- computed; always NULL in stored rows
-   profile_id INTEGER REFERENCES assistant_profile(id),
-   cron_expression VARCHAR(200) NOT NULL,
-   timezone VARCHAR(100) NOT NULL DEFAULT 'UTC',
-   next_run_at TIMESTAMPTZ,
-   output_mode VARCHAR(20) NOT NULL DEFAULT 'RECORD' CHECK (output_mode IN ('RECORD', 'NOTIFICATION', 'BOTH')),
-   write_mode_requested BOOLEAN NOT NULL DEFAULT FALSE,
-   write_mode_approved_by VARCHAR(200),
-   write_mode_approved_at TIMESTAMPTZ,
-   write_mode_approval_hash VARCHAR(64),
-   max_cost_usd_per_run NUMERIC(18,6) CHECK (max_cost_usd_per_run >= 0),
-   last_run_at TIMESTAMPTZ,
-   last_run_status VARCHAR(20),
-   last_run_error VARCHAR(500),
-   create_date TIMESTAMPTZ,
-   modify_date TIMESTAMPTZ
-);
-CREATE INDEX assistant_scheduled_task_due ON assistant_scheduled_task(next_run_at) WHERE enabled;
-
-ALTER TABLE assistant_conversation ADD COLUMN scheduled_task_id INTEGER REFERENCES assistant_scheduled_task(id);
-ALTER TABLE assistant_conversation ADD COLUMN channel VARCHAR(64) NOT NULL DEFAULT 'panel';
-ALTER TABLE assistant_tool_call ADD COLUMN client_channel VARCHAR(64);
-
-CREATE TABLE assistant_scheduled_run (
-   id SERIAL PRIMARY KEY,
-   task_id INTEGER NOT NULL REFERENCES assistant_scheduled_task(id),
-   user_id VARCHAR(200) NOT NULL,
-   scheduled_for TIMESTAMPTZ NOT NULL,
-   started_at TIMESTAMPTZ,
-   ended_at TIMESTAMPTZ,
-   status VARCHAR(20) NOT NULL CHECK (status IN ('RUNNING', 'OK', 'FAILED', 'SKIPPED', 'BLOCKED')),
-   conversation_id INTEGER REFERENCES assistant_conversation(id) ON DELETE SET NULL,
-   turn_id INTEGER REFERENCES assistant_turn(id) ON DELETE SET NULL,
-   summary TEXT,
-   cost_micros BIGINT,
-   error TEXT,
-   create_date TIMESTAMPTZ,
-   modify_date TIMESTAMPTZ,
-   UNIQUE (task_id, scheduled_for)
-);
-CREATE INDEX assistant_scheduled_run_owner ON assistant_scheduled_run(user_id, started_at);
-
--- X1/Y1: encoded audit filters can exceed the old 500-character record links.
-ALTER TABLE assistant_tool_call ALTER COLUMN audit_href TYPE TEXT;
-
-
--- Durable turns: apply this additive block before deploying the new runtime.
--- Like earlier additions, fresh installs run the CREATEs followed by ALTERs.
-ALTER TABLE assistant_turn ADD COLUMN heartbeat_at TIMESTAMP;
-ALTER TABLE assistant_turn ADD COLUMN lease_owner VARCHAR(100);
-ALTER TABLE assistant_turn ADD COLUMN cancel_requested_at TIMESTAMP;
-ALTER TABLE assistant_turn ADD COLUMN phase VARCHAR(64);
-ALTER TABLE assistant_turn ADD COLUMN concurrency_mode VARCHAR(16);
-CREATE INDEX assistant_turn_user_status ON assistant_turn (user_id, status);
-
--- Fence concurrent orphan reapers at the database boundary. A turn ends once.
--- Check for pre-existing duplicate message.end rows before applying this index.
-CREATE UNIQUE INDEX assistant_turn_event_terminal ON assistant_turn_event (turn_id)
-   WHERE event_type = 'message.end';
-
--- Index audit (2026-10-14): lookup, retention and FK paths with no leading index.
--- ScheduledTurn.cost reads usage by turn on every scheduled run.
-CREATE INDEX IF NOT EXISTS assistant_usage_turn ON assistant_usage (turn_id);
--- Retention: deleteTurnEventsBefore, clearToolResultsBefore and listConversationsInactiveSince filter by date.
-CREATE INDEX IF NOT EXISTS assistant_turn_event_create_date ON assistant_turn_event (create_date);
-CREATE INDEX IF NOT EXISTS assistant_tool_call_create_date ON assistant_tool_call (create_date);
-CREATE INDEX IF NOT EXISTS assistant_conversation_modify_date ON assistant_conversation (modify_date);
--- ON DELETE SET NULL children: deleting a conversation or turn would scan scheduled runs without these.
-CREATE INDEX IF NOT EXISTS assistant_scheduled_run_conversation ON assistant_scheduled_run (conversation_id);
-CREATE INDEX IF NOT EXISTS assistant_scheduled_run_turn ON assistant_scheduled_run (turn_id);
-
--- Foreign keys (2026-10-14). Run on new and existing databases; every step is guarded
--- and re-runnable. The rules follow how the qbit deletes:
--- * AssistantStore.deleteConversation (also the retention purge) deletes turn events,
---   tool calls, feedback, messages, turns, data audit and pending actions, then the
---   conversation. The conversation's own detail rows CASCADE, so an admin delete of a
---   conversation cleans up the same way.
--- * The message <-> turn cycle (turn.user_message_id / assistant_message_id and
---   message.turn_id) and the other optional pointers are SET NULL. Rows are inserted
---   parent first, so nothing is deferred.
--- * assistant_usage keeps its cost rows when a conversation goes (SET NULL), and the
---   data audit trail is never cascaded into (SET NULL).
--- * Provider references from usage, budget accounting and the data audit are NO ACTION
---   (like assistant_turn.provider_id): disable a provider with history, do not delete
---   it. A provider's model rows are its own (CASCADE).
--- * assistant_budget_usage.usage_id has no foreign key on purpose: the projection
---   outlives its usage row so budgets keep counting the spend.
--- Rows that already point at a missing parent are recorded in qqq_fk_quarantine first,
--- then nulled (nullable columns) or deleted with the full row recorded (NOT NULL).
-CREATE INDEX IF NOT EXISTS assistant_message_parent_message ON assistant_message (parent_message_id);
-CREATE INDEX IF NOT EXISTS assistant_message_turn ON assistant_message (turn_id);
-CREATE INDEX IF NOT EXISTS assistant_turn_user_message ON assistant_turn (user_message_id);
-CREATE INDEX IF NOT EXISTS assistant_turn_assistant_message ON assistant_turn (assistant_message_id);
-CREATE INDEX IF NOT EXISTS assistant_turn_provider ON assistant_turn (provider_id);
-CREATE INDEX IF NOT EXISTS assistant_tool_call_pending_action ON assistant_tool_call (pending_action_id);
-CREATE INDEX IF NOT EXISTS assistant_feedback_message ON assistant_feedback (message_id);
-CREATE INDEX IF NOT EXISTS assistant_pending_action_turn ON assistant_pending_action (turn_id);
-CREATE INDEX IF NOT EXISTS assistant_data_audit_provider ON assistant_data_audit (provider_id);
-CREATE INDEX IF NOT EXISTS assistant_budget_usage_provider ON assistant_budget_usage (provider_id);
-CREATE INDEX IF NOT EXISTS assistant_profile_skill_skill ON assistant_profile_skill (skill_id);
-CREATE INDEX IF NOT EXISTS assistant_budget_downgrade_model ON assistant_budget (downgrade_model_id);
-CREATE INDEX IF NOT EXISTS assistant_conversation_scheduled_task ON assistant_conversation (scheduled_task_id);
-CREATE INDEX IF NOT EXISTS assistant_model_fallback_model ON assistant_model (fallback_model_id);
-CREATE INDEX IF NOT EXISTS assistant_profile_simple_model ON assistant_profile (simple_model_id);
-CREATE INDEX IF NOT EXISTS assistant_profile_complex_model ON assistant_profile (complex_model_id);
-CREATE INDEX IF NOT EXISTS assistant_profile_classifier_model ON assistant_profile (classifier_model_id);
-CREATE INDEX IF NOT EXISTS assistant_rag_source_embedding_model ON assistant_rag_source (embedding_model_id);
-CREATE INDEX IF NOT EXISTS assistant_scheduled_task_profile ON assistant_scheduled_task (profile_id);
-
-CREATE TABLE IF NOT EXISTS qqq_fk_quarantine (id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, table_name VARCHAR(100) NOT NULL, column_name VARCHAR(100) NOT NULL, row_id VARCHAR(100), missing_parent_id VARCHAR(100), action VARCHAR(20) NOT NULL, row_data TEXT, changeset VARCHAR(200), quarantined_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP);
-
-DO $$
-DECLARE
-   r   RECORD;
-   old TEXT;
-BEGIN
-   FOR r IN SELECT * FROM (VALUES
-      ('assistant_message',        'conversation_id',      'assistant_conversation',   'CASCADE',   TRUE),
-      ('assistant_message',        'parent_message_id',    'assistant_message',        'SET NULL',  TRUE),
-      ('assistant_message',        'turn_id',              'assistant_turn',           'SET NULL',  TRUE),
-      ('assistant_turn',           'conversation_id',      'assistant_conversation',   'CASCADE',   TRUE),
-      ('assistant_turn',           'user_message_id',      'assistant_message',        'SET NULL',  TRUE),
-      ('assistant_turn',           'assistant_message_id', 'assistant_message',        'SET NULL',  TRUE),
-      ('assistant_turn_event',     'turn_id',              'assistant_turn',           'CASCADE',   TRUE),
-      ('assistant_tool_call',      'conversation_id',      'assistant_conversation',   'CASCADE',   TRUE),
-      ('assistant_tool_call',      'turn_id',              'assistant_turn',           'CASCADE',   TRUE),
-      ('assistant_tool_call',      'pending_action_id',    'assistant_pending_action', 'SET NULL',  TRUE),
-      ('assistant_feedback',       'conversation_id',      'assistant_conversation',   'CASCADE',   TRUE),
-      ('assistant_feedback',       'message_id',           'assistant_message',        'CASCADE',   TRUE),
-      ('assistant_pending_action', 'conversation_id',      'assistant_conversation',   'CASCADE',   TRUE),
-      ('assistant_pending_action', 'turn_id',              'assistant_turn',           'SET NULL',  TRUE),
-      ('assistant_data_audit',     'conversation_id',      'assistant_conversation',   'SET NULL',  TRUE),
-      ('assistant_data_audit',     'turn_id',              'assistant_turn',           'SET NULL',  TRUE),
-      ('assistant_usage',          'conversation_id',      'assistant_conversation',   'SET NULL',  TRUE),
-      ('assistant_usage',          'turn_id',              'assistant_turn',           'SET NULL',  TRUE),
-      ('assistant_usage',          'provider_id',          'assistant_provider',       'NO ACTION', TRUE),
-      ('assistant_data_audit',     'provider_id',          'assistant_provider',       'NO ACTION', TRUE),
-      ('assistant_budget_usage',   'provider_id',          'assistant_provider',       'NO ACTION', TRUE),
-      ('assistant_profile_skill',  'profile_id',           'assistant_profile',        'CASCADE',   FALSE),
-      ('assistant_profile_skill',  'skill_id',             'assistant_skill',          'CASCADE',   FALSE)
-   ) AS v(child, col, parent, rule, nullable)
-   LOOP
-      IF NOT EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema = current_schema() AND LOWER(constraint_name) = 'fk_' || r.child || '_' || r.col) THEN
-         IF r.nullable THEN
-            EXECUTE format('INSERT INTO qqq_fk_quarantine (table_name, column_name, row_id, missing_parent_id, action, changeset) '
-               || 'SELECT %L, %L, c.id::text, c.%I::text, ''NULLED'', ''qbit-assistant 2026-10-14 foreign keys'' FROM %I c '
-               || 'WHERE c.%I IS NOT NULL AND NOT EXISTS (SELECT 1 FROM %I p WHERE p.id = c.%I)', r.child, r.col, r.col, r.child, r.col, r.parent, r.col);
-            EXECUTE format('UPDATE %I c SET %I = NULL WHERE c.%I IS NOT NULL AND NOT EXISTS (SELECT 1 FROM %I p WHERE p.id = c.%I)', r.child, r.col, r.col, r.parent, r.col);
-         ELSE
-            EXECUTE format('INSERT INTO qqq_fk_quarantine (table_name, column_name, row_id, missing_parent_id, action, row_data, changeset) '
-               || 'SELECT %L, %L, c.id::text, c.%I::text, ''DELETED'', row_to_json(c)::text, ''qbit-assistant 2026-10-14 foreign keys'' FROM %I c '
-               || 'WHERE NOT EXISTS (SELECT 1 FROM %I p WHERE p.id = c.%I)', r.child, r.col, r.col, r.child, r.parent, r.col);
-            EXECUTE format('DELETE FROM %I c WHERE NOT EXISTS (SELECT 1 FROM %I p WHERE p.id = c.%I)', r.child, r.parent, r.col);
-         END IF;
-         EXECUTE format('ALTER TABLE %I ADD CONSTRAINT %I FOREIGN KEY (%I) REFERENCES %I (id) ON DELETE %s', r.child, 'fk_' || r.child || '_' || r.col, r.col, r.parent, r.rule);
-      END IF;
-   END LOOP;
-
-   -- assistant_model.provider_id: the inline NO ACTION key becomes CASCADE, named as on kof22.
-   IF NOT EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema = current_schema() AND LOWER(constraint_name) = 'fk_assistant_model_provider') THEN
-      FOR old IN SELECT conname FROM pg_constraint
-         WHERE contype = 'f' AND conrelid = 'assistant_model'::regclass AND confrelid = 'assistant_provider'::regclass
-      LOOP
-         EXECUTE format('ALTER TABLE assistant_model DROP CONSTRAINT %I', old);
-      END LOOP;
-      ALTER TABLE assistant_model ADD CONSTRAINT fk_assistant_model_provider FOREIGN KEY (provider_id) REFERENCES assistant_provider (id) ON DELETE CASCADE;
-   END IF;
-END $$;
-
--- Transcript redaction: tokens can expand beyond the original payload bounds.
--- Apply to existing databases as well; SET DATA TYPE is also valid in H2.
-ALTER TABLE assistant_turn ALTER COLUMN stop_reason SET DATA TYPE TEXT;
-ALTER TABLE assistant_tool_call ALTER COLUMN tool_call_id SET DATA TYPE TEXT;
-ALTER TABLE assistant_feedback ALTER COLUMN reason SET DATA TYPE TEXT;
-ALTER TABLE assistant_usage ALTER COLUMN request_id SET DATA TYPE TEXT;
-ALTER TABLE assistant_pending_action ALTER COLUMN tool_call_id SET DATA TYPE TEXT;
-ALTER TABLE assistant_data_audit ALTER COLUMN reason SET DATA TYPE TEXT;
-ALTER TABLE assistant_budget_override ALTER COLUMN reason SET DATA TYPE TEXT;
-ALTER TABLE assistant_scheduled_run ALTER COLUMN summary SET DATA TYPE TEXT;
-ALTER TABLE assistant_scheduled_run ALTER COLUMN error SET DATA TYPE TEXT;

pom.xml

@@ -20,7 +20,7 @@
    <!-- Multi-module build. The qqq-orb sets the revision here; the modules -->
    <!-- inherit it, and the flatten plugin resolves it in the published POMs. -->
    <properties>
-      <revision>0.1.0-SNAPSHOT</revision>
+      <revision>0.1.0-RC.10</revision>
       <maven.compiler.source>21</maven.compiler.source>
       <maven.compiler.target>21</maven.compiler.target>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -28,8 +28,6 @@
       <anthropic.version>2.71.0</anthropic.version>
       <archunit.version>1.5.1</archunit.version>
       <jackson.version>2.21.7</jackson.version>
-      <!-- optional email delivery; qbit-email from Maven Central -->
-      <qbit-email.version>0.1.0-RC.2</qbit-email.version>
       <!-- live evals call the real API; run them with -Dtest.excludedGroups= -Dgroups=live -->
       <test.excludedGroups>live</test.excludedGroups>
    </properties>
@@ -37,7 +35,7 @@
    <parent>
       <groupId>com.kingsrook</groupId>
       <artifactId>qbit-build-parent</artifactId>
-      <version>2.1.1</version>
+      <version>2.0.0</version>
    </parent>
 
    <groupId>com.kingsrook.qbits</groupId>
@@ -52,7 +50,6 @@
    <modelVersion>4.0.0</modelVersion>
 
    <modules>
-      <module>qbit-assistant-provider-api</module>
       <module>qbit-assistant</module>
       <module>qbit-assistant-provider-anthropic</module>
       <module>qbit-assistant-provider-openai</module>
@@ -88,11 +85,6 @@
 
    <dependencyManagement>
       <dependencies>
-         <dependency>
-            <groupId>com.kingsrook.qbits</groupId>
-            <artifactId>qbit-assistant-provider-api</artifactId>
-            <version>${revision}</version>
-         </dependency>
          <dependency>
             <groupId>com.kingsrook.qbits</groupId>
             <artifactId>qbit-assistant-provider-anthropic</artifactId>
@@ -202,9 +194,8 @@
    </build>
 
    <profiles>
-      <!-- The assistant needs QQQ 4.1.0-RC.6: the AI tool kernel (qqq#1078), the  -->
-      <!-- developer panels (qqq#1076) and the UI API extension point, invoker   -->
-      <!-- and credentials (qqq#1128). Until                                      -->
+      <!-- The assistant needs QQQ 4.1.0-RC.5: the AI tool kernel (package        -->
+      <!-- actions.ai, qqq#1078) and the developer panels (qqq#1076). Until        -->
       <!-- qbit-build-parent imports the 4.1 BOM, this                              -->
       <!-- profile is active by default and imports qqq-bom-pom ahead of the        -->
       <!-- parent's 4.0.0 BOM, as in qbit-quick-search (ADR-0007). Override with    -->
@@ -215,8 +206,7 @@
             <activeByDefault>true</activeByDefault>
          </activation>
          <properties>
-            <!-- RC.7 carries qqq#1182 classified-value tokens and log redaction. Keep the PR draft until published. -->
-            <qqq.snapshot.version>4.1.0-RC.7</qqq.snapshot.version>
+            <qqq.snapshot.version>4.1.0-RC.5</qqq.snapshot.version>
          </properties>
          <dependencyManagement>
             <dependencies>

qbit-assistant-provider-anthropic/pom.xml

@@ -32,14 +32,9 @@
    <url>https://github.com/QRun-IO/qbit-assistant</url>
 
    <dependencies>
-      <dependency>
-         <groupId>com.kingsrook.qbits</groupId>
-         <artifactId>qbit-assistant-provider-api</artifactId>
-      </dependency>
       <dependency>
          <groupId>com.kingsrook.qbits</groupId>
          <artifactId>qbit-assistant</artifactId>
-         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>com.kingsrook.qqq</groupId>

qbit-assistant-provider-anthropic/src/main/java/com/kingsrook/qbits/assistant/provider/anthropic/AnthropicMapping.java

@@ -40,15 +40,15 @@ import com.anthropic.models.messages.ToolUseBlock;
 import com.anthropic.models.messages.ToolUseBlockParam;
 import com.anthropic.models.messages.Usage;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.kingsrook.qbits.assistant.spi.CacheHint;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelPart;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qbits.assistant.spi.ModelToolDefinition;
-import com.kingsrook.qbits.assistant.spi.ModelUsage;
-import com.kingsrook.qbits.assistant.spi.SystemBlock;
+import com.kingsrook.qbits.assistant.provider.CacheHint;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelPart;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
+import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
+import com.kingsrook.qbits.assistant.provider.ModelUsage;
+import com.kingsrook.qbits.assistant.provider.SystemBlock;
 
 
 /*******************************************************************************

qbit-assistant-provider-anthropic/src/main/java/com/kingsrook/qbits/assistant/provider/anthropic/AnthropicModelProvider.java

@@ -29,14 +29,14 @@ import com.anthropic.core.http.StreamResponse;
 import com.anthropic.helpers.MessageAccumulator;
 import com.anthropic.models.messages.MessageCreateParams;
 import com.anthropic.models.messages.RawMessageStreamEvent;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.CompletableStreamHandle;
-import com.kingsrook.qbits.assistant.spi.ModelCapabilities;
-import com.kingsrook.qbits.assistant.spi.ModelEventListener;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelUsage;
-import com.kingsrook.qbits.assistant.spi.StreamHandle;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.CompletableStreamHandle;
+import com.kingsrook.qbits.assistant.provider.ModelCapabilities;
+import com.kingsrook.qbits.assistant.provider.ModelEventListener;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelUsage;
+import com.kingsrook.qbits.assistant.provider.StreamHandle;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;

qbit-assistant-provider-anthropic/src/main/java/com/kingsrook/qbits/assistant/provider/anthropic/AnthropicProviderType.java

@@ -18,8 +18,8 @@ package com.kingsrook.qbits.assistant.provider.anthropic;
 
 
 import java.util.List;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
 
 
 /*******************************************************************************

qbit-assistant-provider-anthropic/src/test/java/com/kingsrook/qbits/assistant/provider/anthropic/AnthropicModelProviderTest.java

@@ -24,16 +24,16 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.kingsrook.qbits.assistant.spi.CacheHint;
-import com.kingsrook.qbits.assistant.spi.ModelEventListener;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelPart;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qbits.assistant.spi.ModelToolDefinition;
-import com.kingsrook.qbits.assistant.spi.StreamHandle;
-import com.kingsrook.qbits.assistant.spi.SystemBlock;
+import com.kingsrook.qbits.assistant.provider.CacheHint;
+import com.kingsrook.qbits.assistant.provider.ModelEventListener;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelPart;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
+import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
+import com.kingsrook.qbits.assistant.provider.StreamHandle;
+import com.kingsrook.qbits.assistant.provider.SystemBlock;
 import com.kingsrook.qqq.backend.core.utils.JsonUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

qbit-assistant-provider-anthropic/src/test/java/com/kingsrook/qbits/assistant/provider/anthropic/AnthropicRequestContractTest.java

@@ -26,10 +26,10 @@ import java.util.Set;
 import com.anthropic.core.ObjectMappers;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
 import com.kingsrook.qbits.assistant.provider.fake.ScriptedModelProvider;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelToolDefinition;
 import com.kingsrook.qbits.assistant.testing.AssistantTestFixture;
 import com.kingsrook.qbits.assistant.testing.TurnRunner;
 import com.kingsrook.qqq.backend.core.context.QContext;

qbit-assistant-provider-anthropic/src/test/java/com/kingsrook/qbits/assistant/provider/anthropic/LiveGoldenEvalTest.java

@@ -24,7 +24,6 @@ import com.kingsrook.qbits.assistant.testing.GoldenTasks;
 import com.kingsrook.qbits.assistant.testing.TurnRunner;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-import com.kingsrook.qqq.backend.core.model.metadata.permissions.ClientChannelsMetaData;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
@@ -103,10 +102,6 @@ class LiveGoldenEvalTest
    @MethodSource("tasks")
    void live(GoldenTasks.Task task) throws Exception
    {
-      if("D-page-12-this-week".equals(task.id()))
-      {
-         ClientChannelsMetaData.ofOrWithNew(qInstance).getDeniedPatterns().get("assistant").remove("audit*");
-      }
       TurnRunner.Outcome outcome = new TurnRunner(qInstance, config).run(task.userId(), task.prompt());
       assertThat(outcome.errorCode()).as("error").isNull();
       task.liveCheck().accept(outcome);

qbit-assistant-provider-anthropic/src/test/java/com/kingsrook/qbits/assistant/provider/anthropic/demo/AssistantDemoServer.java

@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.Set;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
 import com.kingsrook.qbits.assistant.engine.ConnectionTest;
+import com.kingsrook.qbits.assistant.engine.ModelPricing;
 import com.kingsrook.qbits.assistant.metadata.AssistantMetaDataBuilder;
 import com.kingsrook.qbits.assistant.model.AssistantModelPrice;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
@@ -31,7 +32,6 @@ import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicModelProvider;
 import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicProviderType;
 import com.kingsrook.qbits.assistant.provider.anthropic.RecordedAnthropicServer;
 import com.kingsrook.qbits.assistant.provider.fake.ScriptedModelProvider;
-import com.kingsrook.qbits.assistant.spi.ModelPricing;
 import com.kingsrook.qbits.assistant.testing.AssistantTestFixture;
 import com.kingsrook.qbits.assistant.testing.TurnRunner;
 import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;

qbit-assistant-provider-api/pom.xml

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2026 Kingsrook, LLC
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>com.kingsrook.qbits</groupId>
-      <artifactId>qbit-assistant-parent</artifactId>
-      <version>${revision}</version>
-   </parent>
-
-   <artifactId>qbit-assistant-provider-api</artifactId>
-   <packaging>jar</packaging>
-
-   <name>QBit Assistant - Provider API</name>
-   <description>Provider SPI and pricing value types, independent of the assistant runtime</description>
-   <url>https://github.com/QRun-IO/qbit-assistant</url>
-
-   <dependencies>
-      <dependency>
-         <groupId>com.fasterxml.jackson.core</groupId>
-         <artifactId>jackson-annotations</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>com.fasterxml.jackson.core</groupId>
-         <artifactId>jackson-databind</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.junit.jupiter</groupId>
-         <artifactId>junit-jupiter</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.assertj</groupId>
-         <artifactId>assertj-core</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>com.tngtech.archunit</groupId>
-         <artifactId>archunit-junit5</artifactId>
-         <scope>test</scope>
-      </dependency>
-   </dependencies>
-
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <redirectTestOutputToFile>true</redirectTestOutputToFile>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>prepare-agent</id>
-                  <goals>
-                     <goal>prepare-agent</goal>
-                  </goals>
-               </execution>
-               <execution>
-                  <id>report</id>
-                  <phase>verify</phase>
-                  <goals>
-                     <goal>report</goal>
-                  </goals>
-               </execution>
-               <execution>
-                  <id>check</id>
-                  <goals>
-                     <goal>check</goal>
-                  </goals>
-                  <configuration>
-                     <rules>
-                        <rule>
-                           <element>BUNDLE</element>
-                           <limits>
-                              <limit>
-                                 <counter>INSTRUCTION</counter>
-                                 <value>COVEREDRATIO</value>
-                                 <minimum>0.70</minimum>
-                              </limit>
-                              <limit>
-                                 <counter>CLASS</counter>
-                                 <value>COVEREDRATIO</value>
-                                 <minimum>0.90</minimum>
-                              </limit>
-                           </limits>
-                        </rule>
-                     </rules>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-      </plugins>
-   </build>
-</project>

qbit-assistant-provider-api/src/test/java/com/kingsrook/qbits/assistant/spi/ProviderApiArchitectureTest.java

@@ -1,46 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.spi;
-
-
-import com.tngtech.archunit.core.domain.JavaClasses;
-import com.tngtech.archunit.core.importer.ClassFileImporter;
-import org.junit.jupiter.api.Test;
-import static com.tngtech.archunit.core.domain.JavaClass.Predicates.resideInAPackage;
-import static com.tngtech.archunit.core.domain.JavaClass.Predicates.resideOutsideOfPackage;
-import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
-import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
-
-
-/*******************************************************************************
- ** Keep external provider consumers independent of the assistant runtime and QQQ.
- *******************************************************************************/
-class ProviderApiArchitectureTest
-{
-   /*******************************************************************************
-    ** Import the entire artifact so an accidental package outside spi also fails.
-    *******************************************************************************/
-   @Test
-   void dependsOnlyOnApiTypes()
-   {
-      String spiPackage = "com.kingsrook.qbits.assistant.spi";
-      JavaClasses imported = new ClassFileImporter().importUrl(AssistantModelProvider.class.getProtectionDomain().getCodeSource().getLocation());
-      classes().should().resideInAPackage(spiPackage).check(imported);
-      noClasses().should().dependOnClassesThat(resideInAPackage("com.kingsrook.qbits..").and(resideOutsideOfPackage(spiPackage))).check(imported);
-      noClasses().should().dependOnClassesThat().resideInAnyPackage("com.kingsrook.qqq..").check(imported);
-   }
-}

qbit-assistant-provider-api/src/test/java/com/kingsrook/qbits/assistant/spi/ProviderApiTest.java

@@ -1,213 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.spi;
-
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import javax.net.ssl.SSLContext;
-import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-
-/*******************************************************************************
- ** Provider contracts work on a classpath with no assistant runtime or QQQ.
- *******************************************************************************/
-class ProviderApiTest
-{
-   private final ObjectMapper mapper = new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-
-
-
-   /*******************************************************************************
-    ** Preserve provider-neutral requests and tool order through JSON; signed
-    ** provider state remains in memory only.
-    *******************************************************************************/
-   @Test
-   void requestRoundTripAndCopy() throws Exception
-   {
-      ModelCapabilities capabilities = new ModelCapabilities().withTools(true).withParallelToolCalls(true)
-         .withPromptCaching(true).withThinking(false).withMaxContextTokens(32000)
-         .withVision(false).withStreaming(true).withReasoningEffort(true);
-      ModelToolDefinition tool = new ModelToolDefinition().withName("lookup").withDescription("Look up a record")
-         .withInputSchema(Map.of("type", "object")).withStrict(true);
-      ModelMessage user = ModelMessage.user("Find it").withCacheHint(CacheHint.SHORT);
-      ModelMessage assistant = ModelMessage.assistant("Looking").withPart(ModelPart.toolUse("call-1", "lookup", null))
-         .withProviderState("private-signature");
-      ModelMessage result = new ModelMessage().withRole(ModelMessage.Role.USER)
-         .withParts(List.of(ModelPart.toolResult("call-1", "denied", true)));
-      ModelRequest request = new ModelRequest().withModel("example").withEffort("low").withMaxTokens(100)
-         .withParallelToolCalls(true).withStreaming(false).withCapabilities(capabilities)
-         .withSystem(List.of(new SystemBlock("rules", CacheHint.LONG), new SystemBlock().withText("user context").withCacheHint(CacheHint.SHORT)))
-         .withTools(List.of(tool)).withMessages(new ArrayList<>(List.of(user, assistant, result)));
-      String json = mapper.writeValueAsString(request);
-      assertThat(json).doesNotContain("private-signature", "providerState");
-      ModelRequest restored = mapper.readValue(json, ModelRequest.class);
-      assertThat(mapper.<JsonNode>valueToTree(restored)).isEqualTo(mapper.valueToTree(request));
-      assertThat(restored.getMessages().get(1).getProviderState()).isNull();
-      assertThat(restored.getMessages().get(2).getParts().get(0).getIsError()).isTrue();
-      ModelRequest copy = request.copy();
-      assertThat(mapper.<JsonNode>valueToTree(copy)).isEqualTo(mapper.valueToTree(request));
-      copy.getMessages().clear();
-      assertThat(request.getMessages()).hasSize(3);
-   }
-
-
-
-   /*******************************************************************************
-    ** Response helpers retain tool ordering, text, usage and safe metadata.
-    *******************************************************************************/
-   @Test
-   void responseAndPricingRoundTrip() throws Exception
-   {
-      ModelUsage usage = new ModelUsage().withInputTokens(2L).withOutputTokens(3L)
-         .withCacheReadTokens(4L).withCacheWriteTokens(5L).withCacheWrite1hTokens(1L);
-      ModelPart first = ModelPart.toolUse("first", "lookup", Map.of("id", 1));
-      ModelPart second = ModelPart.toolUse("second", "lookup", Map.of("id", 2));
-      ModelResponse response = new ModelResponse().withParts(List.of(ModelPart.text("a"), first, ModelPart.text("b"), second))
-         .withModel("example").withStopReason(ModelResponse.STOP_TOOL_USE).withRequestId("request-1")
-         .withUsage(usage).withProviderState("signature");
-      assertThat(response.getText()).isEqualTo("ab");
-      assertThat(response.getToolUses()).containsExactly(first, second);
-      String json = mapper.writeValueAsString(response);
-      assertThat(json).doesNotContain("signature", "providerState");
-      ModelResponse restored = mapper.readValue(json, ModelResponse.class);
-      assertThat(mapper.<JsonNode>valueToTree(restored)).isEqualTo(mapper.valueToTree(response));
-      assertThat(restored.getProviderState()).isNull();
-      assertThat(response.getProviderState()).isEqualTo("signature");
-      ModelPricing pricing = ModelPricing.of(0.1, 0.5, 0.1);
-      ModelPricing restoredPricing = mapper.readValue(mapper.writeValueAsString(pricing), ModelPricing.class);
-      assertThat(restoredPricing.costMicros(usage)).isEqualTo(3);
-      assertThat(new ModelUsage().withInputTokens(null).add(usage).add(null).billableTokens()).isEqualTo(10);
-      TokenCount tokens = mapper.readValue(mapper.writeValueAsString(new TokenCount().withInputTokens(12L)), TokenCount.class);
-      assertThat(tokens.getInputTokens()).isEqualTo(12L);
-   }
-
-
-
-   /*******************************************************************************
-    ** Plain validation settings require no credentials or entity classes, and
-    ** live token suppliers/TLS contexts cannot be serialized into diagnostics.
-    *******************************************************************************/
-   @Test
-   void settingsRoundTrip() throws Exception
-   {
-      ProviderSettings settings = new ProviderSettings().withKind("EXAMPLE").withApiKeyEnvName("EXAMPLE_KEY")
-         .withApiKey("test-only-key").withBaseUrl("https://example.invalid").withApiVersion("v1")
-         .withRegion("region").withCloudProject("project").withTlsCaBundle("corporate")
-         .withConnectTimeoutSeconds(5).withRequestTimeoutSeconds(30)
-         .withBearerTokenSupplier(() -> "ephemeral-token").withSslContext(SSLContext.getDefault());
-      String json = mapper.writeValueAsString(settings);
-      assertThat(json).doesNotContain("ephemeral-token", "bearerTokenSupplier", "sslContext");
-      ProviderSettings restored = mapper.readValue(json, ProviderSettings.class);
-      assertThat(mapper.<JsonNode>valueToTree(restored)).isEqualTo(mapper.valueToTree(settings));
-      assertThat(settings.getBearerTokenSupplier().get()).isEqualTo("ephemeral-token");
-      assertThat(settings.getSslContext()).isNotNull();
-      assertThat(restored.getBearerTokenSupplier()).isNull();
-      assertThat(restored.getSslContext()).isNull();
-   }
-
-
-
-   /*******************************************************************************
-    ** Embedding batches snapshot input and enforce the transport size contract.
-    *******************************************************************************/
-   @Test
-   void embeddingContracts()
-   {
-      List<String> input = new ArrayList<>(List.of("first", "second"));
-      EmbeddingRequest request = new EmbeddingRequest("embed", input);
-      input.clear();
-      assertThat(request.input()).containsExactly("first", "second");
-      assertThatThrownBy(() -> request.input().add("third")).isInstanceOf(UnsupportedOperationException.class);
-      assertThatThrownBy(() -> new EmbeddingRequest(" ", List.of("text"))).isInstanceOf(IllegalArgumentException.class);
-      assertThatThrownBy(() -> new EmbeddingRequest(null, List.of("text"))).isInstanceOf(IllegalArgumentException.class);
-      assertThatThrownBy(() -> new EmbeddingRequest("embed", List.of())).isInstanceOf(IllegalArgumentException.class);
-      assertThatThrownBy(() -> new EmbeddingRequest("embed", Collections.nCopies(65, "text"))).isInstanceOf(IllegalArgumentException.class);
-      assertThat(new EmbeddingRequest("embed", Collections.nCopies(64, "text")).input()).hasSize(64);
-      float[] vector = new float[] { 0.25F, 0.75F };
-      EmbeddingResponse response = new EmbeddingResponse(List.of(vector), new ModelUsage().withInputTokens(2L), "request");
-      assertThat(response.vectors().getFirst()).containsExactly(0.25F, 0.75F);
-      assertThat(response.usage().getInputTokens()).isEqualTo(2L);
-      assertThat(response.requestId()).isEqualTo("request");
-   }
-
-
-
-   /*******************************************************************************
-    ** Cancellation is idempotent, preserves accrued usage, and wins over late
-    ** completion. Timeout also cancels the underlying transport.
-    *******************************************************************************/
-   @Test
-   void cancellationAndTimeout() throws Exception
-   {
-      AtomicInteger cancellations = new AtomicInteger();
-      ModelUsage usage = new ModelUsage().withInputTokens(10L);
-      CompletableStreamHandle handle = new CompletableStreamHandle();
-      handle.setPartialUsage(() -> usage);
-      handle.setOnCancel(cancellations::incrementAndGet);
-      handle.cancel();
-      handle.cancel();
-      handle.complete(new ModelResponse().withStopReason(ModelResponse.STOP_END_TURN));
-      handle.fail(new ModelProviderException(ModelProviderException.Kind.SERVER, 500, "late failure"));
-      assertThat(handle.isCancelled()).isTrue();
-      assertThat(cancellations.get()).isEqualTo(1);
-      assertThat(handle.await(Duration.ofSeconds(1)).getUsage()).isSameAs(usage);
-      CompletableStreamHandle timeout = new CompletableStreamHandle();
-      timeout.setPartialUsage(() -> usage);
-      assertThatThrownBy(() -> timeout.await(Duration.ofMillis(1))).isInstanceOfSatisfying(ModelProviderException.class, error ->
-      {
-         assertThat(error.getKind()).isEqualTo(ModelProviderException.Kind.TIMEOUT);
-         assertThat(error.getPartialUsage()).isSameAs(usage);
-      });
-      assertThat(timeout.isCancelled()).isTrue();
-      handle.setPartialUsage(() ->
-      {
-         throw (new IllegalStateException("closed"));
-      });
-      assertThat(handle.partialUsage()).isNull();
-   }
-
-
-
-   /*******************************************************************************
-    ** Error metadata is bounded and redacted independently of error classification.
-    *******************************************************************************/
-   @Test
-   void errorDetails()
-   {
-      ModelProviderException error = new ModelProviderException(ModelProviderException.Kind.INVALID_REQUEST, 400, "Invalid schema")
-         .withStrictSchemaRejected(true).withProviderDetails("invalid_request", "bad key sk-abcdefghijk\ntry again", "req-123");
-      assertThat(error.isStrictSchemaRejected()).isTrue();
-      assertThat(error.getProviderErrorType()).isEqualTo("invalid_request");
-      assertThat(error.getProviderMessage()).isEqualTo("bad key [redacted] try again");
-      assertThat(error.getRequestId()).isEqualTo("req-123");
-      assertThat(error.isRetryable()).isFalse();
-      assertThat(ModelProviderException.sanitizeProviderMessage(" ", 10)).isNull();
-      assertThat(ModelProviderException.sanitizeProviderMessage(null, 10)).isNull();
-      assertThat(ModelProviderException.sanitizeProviderMessage("word ".repeat(100), 20)).hasSize(20);
-      assertThat(ModelProviderException.sanitizeProviderMessage("a".repeat(50), 100)).isEqualTo("[redacted]");
-   }
-}

qbit-assistant-provider-api/src/test/java/com/kingsrook/qbits/assistant/spi/ProviderComponentsTest.java

@@ -1,79 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.spi;
-
-
-import java.time.Duration;
-import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-
-/*******************************************************************************
- ** Standalone contracts moved from the runtime's component tests.
- *******************************************************************************/
-class ProviderComponentsTest
-{
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Test
-   void testPricing()
-   {
-      ModelPricing sonnet = ModelPricing.defaults().get("claude-sonnet-5-5");
-      ModelUsage   usage  = new ModelUsage().withInputTokens(6000L).withOutputTokens(800L).withCacheReadTokens(12_000L).withCacheWriteTokens(1000L).withCacheWrite1hTokens(400L);
-      //////////////////////////////////////////////////////////////////////////////////
-      // 6000*2 + 800*10 + 12000*0.2 + 600*2.5 + 400*4 = 12000+8000+2400+1500+1600   //
-      //////////////////////////////////////////////////////////////////////////////////
-      assertThat(sonnet.costMicros(usage)).isEqualTo(25_500);
-      assertThat(sonnet.costMicros(null)).isZero();
-      assertThat(new ModelPricing().costMicros(usage)).isZero();
-      assertThat(ModelPricing.defaults().get("claude-opus-5-5").getCacheReadUsdPerMTok()).isEqualTo(0.2);
-      assertThat(usage.billableTokens()).isEqualTo(7800);
-      assertThat(new ModelUsage().add(usage).add(null).getCacheReadTokens()).isEqualTo(12_000);
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Test
-   void testStreamHandle() throws Exception
-   {
-      CompletableStreamHandle handle = new CompletableStreamHandle();
-      handle.complete(new ModelResponse().withStopReason("end_turn"));
-      assertThat(handle.await(Duration.ofSeconds(1)).getStopReason()).isEqualTo("end_turn");
-
-      CompletableStreamHandle failing = new CompletableStreamHandle();
-      failing.fail(new ModelProviderException(ModelProviderException.Kind.RATE_LIMITED, 429, "slow down"));
-      assertThatThrownBy(() -> failing.await(Duration.ofSeconds(1))).isInstanceOfSatisfying(ModelProviderException.class, e ->
-      {
-         assertThat(e.isRetryable()).isTrue();
-         assertThat(e.getHttpStatus()).isEqualTo(429);
-      });
-
-      CompletableStreamHandle cancelled = new CompletableStreamHandle();
-      cancelled.setOnCancel(() ->
-      {
-         throw (new IllegalStateException("closing"));
-      });
-      cancelled.cancel();
-      cancelled.cancel();
-      assertThat(cancelled.await(Duration.ofSeconds(1)).getStopReason()).isEqualTo(ModelResponse.STOP_CANCELLED);
-      assertThat(new ModelProviderException(ModelProviderException.Kind.INVALID_REQUEST, 400, "x").isRetryable()).isFalse();
-   }
-}

qbit-assistant-provider-api/src/test/java/com/kingsrook/qbits/assistant/spi/ProviderDefaultsTest.java

@@ -1,164 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.spi;
-
-
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-
-/*******************************************************************************
- ** A minimal external provider compiles and uses SPI defaults without the runtime.
- *******************************************************************************/
-class ProviderDefaultsTest
-{
-   /*******************************************************************************
-    ** Legacy two-argument factories and static model lists remain supported.
-    *******************************************************************************/
-   @Test
-   void minimalProviderDefaults() throws Exception
-   {
-      ExampleProvider provider = new ExampleProvider();
-      ProviderSettings settings = new ProviderSettings().withApiKey("test-key").withBaseUrl("https://example.invalid");
-      assertThat(provider.create(settings)).isSameAs(provider);
-      assertThat(provider.settings.getApiKey()).isEqualTo("test-key");
-      assertThat(provider.settings.getBaseUrl()).isEqualTo("https://example.invalid");
-      assertThat(provider.getKinds()).containsExactly("EXAMPLE_PROVIDER");
-      assertThat(provider.getDefaultBaseUrl("EXAMPLE_PROVIDER")).isNull();
-      assertThat(provider.getDefaultApiKeyEnvName("EXAMPLE_PROVIDER")).isEqualTo("EXAMPLE_KEY");
-      assertThat(provider.getDefaultLocation("EXAMPLE_PROVIDER")).isEqualTo("CLOUD");
-      assertThat(provider.requiresBaseUrl("EXAMPLE_PROVIDER")).isTrue();
-      assertThat(provider.validate(settings)).isEmpty();
-      assertThat(provider.discoverModels(settings)).containsExactly(new DiscoveredModel("example", "example", null, null));
-      assertThat(provider.checkHealth(settings).healthy()).isNull();
-      assertThat(provider.checkHealth(settings).message()).isEqualTo("Health check not supported");
-      assertThat(new HealthResult(false, 20L, "bad sk-abcdefghijk").message()).isEqualTo("bad [redacted]");
-      assertThat(provider.countTokens(new ModelRequest())).isNull();
-      assertThatThrownBy(() -> provider.embed(new EmbeddingRequest("example", List.of("text"))))
-         .isInstanceOfSatisfying(ModelProviderException.class, error -> assertThat(error.getKind()).isEqualTo(ModelProviderException.Kind.INVALID_REQUEST));
-      StringBuilder deltas = new StringBuilder();
-      ModelEventListener listener = deltas::append;
-      listener.onToolUseStart("call", "lookup");
-      assertThat(deltas).isEmpty();
-      listener.onTextDelta("visible answer");
-      assertThat(deltas).hasToString("visible answer");
-   }
-
-
-
-   /*******************************************************************************
-    ** Only the original required SPI methods are implemented.
-    *******************************************************************************/
-   private static class ExampleProvider implements AssistantProviderType, AssistantModelProvider
-   {
-      private ProviderSettings settings;
-
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public String getType()
-      {
-         return ("example-provider");
-      }
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public String getLabel()
-      {
-         return ("Example");
-      }
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public List<String> getModels()
-      {
-         return (List.of("example"));
-      }
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public String getDefaultApiKeyEnvName()
-      {
-         return ("EXAMPLE_KEY");
-      }
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public String getDefaultBaseUrl()
-      {
-         return (null);
-      }
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public AssistantModelProvider create(String apiKey, String baseUrl)
-      {
-         settings = new ProviderSettings().withApiKey(apiKey).withBaseUrl(baseUrl);
-         return (this);
-      }
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public String getName()
-      {
-         return ("example");
-      }
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public ModelCapabilities getCapabilities(String modelId)
-      {
-         return (new ModelCapabilities());
-      }
-
-
-      /*******************************************************************************
-       ** Minimal provider contract.
-       *******************************************************************************/
-      @Override
-      public StreamHandle stream(ModelRequest request, ModelEventListener listener)
-      {
-         throw (new UnsupportedOperationException());
-      }
-   }
-}

qbit-assistant-provider-bedrock/pom.xml

@@ -41,14 +41,9 @@
          <artifactId>qbit-assistant-provider-anthropic</artifactId>
       </dependency>
 
-      <dependency>
-         <groupId>com.kingsrook.qbits</groupId>
-         <artifactId>qbit-assistant-provider-api</artifactId>
-      </dependency>
       <dependency>
          <groupId>com.kingsrook.qbits</groupId>
          <artifactId>qbit-assistant</artifactId>
-         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>com.kingsrook.qqq</groupId>

qbit-assistant-provider-bedrock/src/main/java/com/kingsrook/qbits/assistant/provider/bedrock/BedrockProviderType.java

@@ -24,11 +24,12 @@ import com.anthropic.backends.Backend;
 import com.anthropic.bedrock.backends.BedrockBackend;
 import com.anthropic.client.okhttp.AnthropicOkHttpClient;
 import com.anthropic.core.Timeout;
+import com.kingsrook.qbits.assistant.model.AssistantProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.DiscoveredModel;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
-import com.kingsrook.qbits.assistant.spi.DiscoveredModel;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
@@ -116,14 +117,14 @@ public class BedrockProviderType implements AssistantProviderType
     ** Validate cloud settings without loading credentials.
     *******************************************************************************/
    @Override
-   public List<String> validate(ProviderSettings settings)
+   public List<String> validate(AssistantProvider row)
    {
       List<String> errors = new ArrayList<>();
-      if(settings.getRegion() == null || settings.getRegion().isBlank())
+      if(row.getRegion() == null || row.getRegion().isBlank())
       {
          errors.add("Region is required for BEDROCK.");
       }
-      if(settings.getApiKeyEnvName() != null && !settings.getApiKeyEnvName().isBlank())
+      if(row.getApiKeyEnvName() != null && !row.getApiKeyEnvName().isBlank())
       {
          errors.add("Leave API key variable empty: AWS Bedrock (Claude) uses the AWS default credential chain (environment, profile or server role).");
       }

qbit-assistant-provider-bedrock/src/test/java/com/kingsrook/qbits/assistant/provider/bedrock/BedrockContractTest.java

@@ -27,13 +27,13 @@ import java.util.Set;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
 import com.kingsrook.qbits.assistant.engine.ProviderService;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
+import com.kingsrook.qbits.assistant.provider.ModelEventListener;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicModelProvider;
-import com.kingsrook.qbits.assistant.spi.ModelEventListener;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelToolDefinition;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
 import com.kingsrook.qbits.assistant.testing.CloudProviderTestServer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;

qbit-assistant-provider-openai/pom.xml

@@ -32,14 +32,9 @@
    <url>https://github.com/QRun-IO/qbit-assistant</url>
 
    <dependencies>
-      <dependency>
-         <groupId>com.kingsrook.qbits</groupId>
-         <artifactId>qbit-assistant-provider-api</artifactId>
-      </dependency>
       <dependency>
          <groupId>com.kingsrook.qbits</groupId>
          <artifactId>qbit-assistant</artifactId>
-         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>com.kingsrook.qqq</groupId>

qbit-assistant-provider-openai/src/main/java/com/kingsrook/qbits/assistant/provider/openai/OpenAiCompatibleModelProvider.java

@@ -36,19 +36,19 @@ import java.util.concurrent.atomic.AtomicReference;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.CompletableStreamHandle;
-import com.kingsrook.qbits.assistant.spi.EmbeddingRequest;
-import com.kingsrook.qbits.assistant.spi.EmbeddingResponse;
-import com.kingsrook.qbits.assistant.spi.ModelCapabilities;
-import com.kingsrook.qbits.assistant.spi.ModelEventListener;
-import com.kingsrook.qbits.assistant.spi.ModelPart;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qbits.assistant.spi.ModelUsage;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
-import com.kingsrook.qbits.assistant.spi.StreamHandle;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.CompletableStreamHandle;
+import com.kingsrook.qbits.assistant.provider.EmbeddingRequest;
+import com.kingsrook.qbits.assistant.provider.EmbeddingResponse;
+import com.kingsrook.qbits.assistant.provider.ModelCapabilities;
+import com.kingsrook.qbits.assistant.provider.ModelEventListener;
+import com.kingsrook.qbits.assistant.provider.ModelPart;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
+import com.kingsrook.qbits.assistant.provider.ModelUsage;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.StreamHandle;
 
 
 /*******************************************************************************

qbit-assistant-provider-openai/src/main/java/com/kingsrook/qbits/assistant/provider/openai/OpenAiCompatibleProviderType.java

@@ -18,12 +18,12 @@ package com.kingsrook.qbits.assistant.provider.openai;
 
 
 import java.util.List;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
-import com.kingsrook.qbits.assistant.spi.DiscoveredModel;
-import com.kingsrook.qbits.assistant.spi.HealthResult;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.DiscoveredModel;
+import com.kingsrook.qbits.assistant.provider.HealthResult;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 
 
 /*******************************************************************************

qbit-assistant-provider-openai/src/main/java/com/kingsrook/qbits/assistant/provider/openai/OpenAiHttp.java

@@ -33,12 +33,12 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import javax.net.ssl.SSLHandshakeException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.kingsrook.qbits.assistant.spi.DiscoveredModel;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
-import javax.net.ssl.SSLHandshakeException;
+import com.kingsrook.qbits.assistant.provider.DiscoveredModel;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 
 
 /*******************************************************************************

qbit-assistant-provider-openai/src/main/java/com/kingsrook/qbits/assistant/provider/openai/OpenAiMapping.java

@@ -24,12 +24,12 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.kingsrook.qbits.assistant.spi.ModelCapabilities;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelPart;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelToolDefinition;
-import com.kingsrook.qbits.assistant.spi.SystemBlock;
+import com.kingsrook.qbits.assistant.provider.ModelCapabilities;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelPart;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
+import com.kingsrook.qbits.assistant.provider.SystemBlock;
 
 
 /*******************************************************************************

qbit-assistant-provider-openai/src/test/java/com/kingsrook/qbits/assistant/provider/openai/LiveOpenAiCompatibleTest.java

@@ -21,10 +21,10 @@ import java.nio.file.Path;
 import java.time.Duration;
 import java.util.List;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;

qbit-assistant-provider-openai/src/test/java/com/kingsrook/qbits/assistant/provider/openai/OpenAiContractTest.java

@@ -22,16 +22,16 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.kingsrook.qbits.assistant.spi.ModelCapabilities;
-import com.kingsrook.qbits.assistant.spi.ModelEventListener;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelPart;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qbits.assistant.spi.ModelToolDefinition;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
-import com.kingsrook.qbits.assistant.spi.SystemBlock;
+import com.kingsrook.qbits.assistant.provider.ModelCapabilities;
+import com.kingsrook.qbits.assistant.provider.ModelEventListener;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelPart;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
+import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.SystemBlock;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;

qbit-assistant-provider-openai/src/test/java/com/kingsrook/qbits/assistant/provider/openai/OpenAiEmbeddingTest.java

@@ -18,9 +18,9 @@ package com.kingsrook.qbits.assistant.provider.openai;
 
 
 import java.util.List;
-import com.kingsrook.qbits.assistant.spi.EmbeddingRequest;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.EmbeddingRequest;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

qbit-assistant-provider-openai/src/test/java/com/kingsrook/qbits/assistant/provider/openai/OpenAiTlsTest.java

@@ -24,14 +24,14 @@ import java.nio.file.Path;
 import java.security.KeyStore;
 import java.time.Duration;
 import java.util.Set;
-import com.kingsrook.qbits.assistant.AssistantQBitConfig;
-import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
-import com.kingsrook.qbits.assistant.testing.AssistantTestFixture;
-import com.kingsrook.qqq.backend.core.context.QContext;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
+import com.kingsrook.qbits.assistant.AssistantQBitConfig;
+import com.kingsrook.qbits.assistant.model.AssistantProvider;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
+import com.kingsrook.qbits.assistant.testing.AssistantTestFixture;
+import com.kingsrook.qqq.backend.core.context.QContext;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import static org.assertj.core.api.Assertions.assertThat;

qbit-assistant-provider-openai/src/test/java/com/kingsrook/qbits/assistant/provider/openai/demo/OpenAiDemoServer.java

@@ -36,9 +36,9 @@ import com.kingsrook.qbits.assistant.persistence.AssistantStore;
 import com.kingsrook.qbits.assistant.processes.DiscoverModelsProcess;
 import com.kingsrook.qbits.assistant.processes.TestConnectionProcess;
 import com.kingsrook.qbits.assistant.processes.TestModelConnectionProcess;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
 import com.kingsrook.qbits.assistant.provider.fake.ScriptedModelProvider;
 import com.kingsrook.qbits.assistant.provider.openai.OpenAiCompatibleProviderType;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
 import com.kingsrook.qbits.assistant.testing.AssistantTestFixture;
 import com.kingsrook.qbits.assistant.testing.EvalSupport;
 import com.kingsrook.qbits.assistant.testing.GoldenTasks;

qbit-assistant-provider-vertex/pom.xml

@@ -45,14 +45,9 @@
          <artifactId>qbit-assistant-provider-openai</artifactId>
       </dependency>
 
-      <dependency>
-         <groupId>com.kingsrook.qbits</groupId>
-         <artifactId>qbit-assistant-provider-api</artifactId>
-      </dependency>
       <dependency>
          <groupId>com.kingsrook.qbits</groupId>
          <artifactId>qbit-assistant</artifactId>
-         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>com.kingsrook.qqq</groupId>

qbit-assistant-provider-vertex/src/main/java/com/kingsrook/qbits/assistant/provider/vertex/VertexModelProvider.java

@@ -23,14 +23,14 @@ import com.anthropic.client.okhttp.AnthropicOkHttpClient;
 import com.anthropic.core.Timeout;
 import com.anthropic.vertex.backends.VertexBackend;
 import com.google.auth.oauth2.GoogleCredentials;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.ModelCapabilities;
+import com.kingsrook.qbits.assistant.provider.ModelEventListener;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.StreamHandle;
 import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicModelProvider;
 import com.kingsrook.qbits.assistant.provider.openai.OpenAiCompatibleModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.ModelCapabilities;
-import com.kingsrook.qbits.assistant.spi.ModelEventListener;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
-import com.kingsrook.qbits.assistant.spi.StreamHandle;
 
 
 /*******************************************************************************

qbit-assistant-provider-vertex/src/main/java/com/kingsrook/qbits/assistant/provider/vertex/VertexProviderType.java

@@ -19,10 +19,11 @@ package com.kingsrook.qbits.assistant.provider.vertex;
 
 import java.util.ArrayList;
 import java.util.List;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
-import com.kingsrook.qbits.assistant.spi.DiscoveredModel;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
+import com.kingsrook.qbits.assistant.model.AssistantProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.DiscoveredModel;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 
 
 /*******************************************************************************
@@ -103,18 +104,18 @@ public class VertexProviderType implements AssistantProviderType
     ** Validate cloud settings without loading credentials.
     *******************************************************************************/
    @Override
-   public List<String> validate(ProviderSettings settings)
+   public List<String> validate(AssistantProvider row)
    {
       List<String> errors = new ArrayList<>();
-      if(settings.getRegion() == null || settings.getRegion().isBlank())
+      if(row.getRegion() == null || row.getRegion().isBlank())
       {
          errors.add("Region is required for VERTEX.");
       }
-      if(settings.getApiKeyEnvName() != null && !settings.getApiKeyEnvName().isBlank())
+      if(row.getApiKeyEnvName() != null && !row.getApiKeyEnvName().isBlank())
       {
          errors.add("Leave API key variable empty: Google Vertex AI (Claude, Gemini) uses Google Application Default Credentials (GOOGLE_APPLICATION_CREDENTIALS or workload identity).");
       }
-      if(settings.getCloudProject() == null || settings.getCloudProject().isBlank())
+      if(row.getCloudProject() == null || row.getCloudProject().isBlank())
       {
          errors.add("GCP project id (cloudProject) is required for VERTEX.");
       }

qbit-assistant-provider-vertex/src/test/java/com/kingsrook/qbits/assistant/provider/vertex/VertexContractTest.java

@@ -29,11 +29,11 @@ import com.google.auth.oauth2.GoogleCredentials;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
 import com.kingsrook.qbits.assistant.engine.ProviderService;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelToolDefinition;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 import com.kingsrook.qbits.assistant.testing.CloudProviderTestServer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;

qbit-assistant/pom.xml

@@ -28,14 +28,10 @@
    <packaging>jar</packaging>
 
    <name>QBit Assistant</name>
-   <description>In-app AI assistant QBit for QQQ: conversations, turn engine, SSE routes, budgets and provider registry</description>
+   <description>In-app AI assistant QBit for QQQ: conversations, turn engine, SSE routes, budgets, provider SPI</description>
    <url>https://github.com/QRun-IO/qbit-assistant</url>
 
    <dependencies>
-      <dependency>
-         <groupId>com.kingsrook.qbits</groupId>
-         <artifactId>qbit-assistant-provider-api</artifactId>
-      </dependency>
       <dependency>
          <groupId>com.kingsrook.qqq</groupId>
          <artifactId>qqq-backend-core</artifactId>
@@ -49,15 +45,6 @@
          <optional>true</optional>
       </dependency>
 
-      <!-- Optional email delivery of scheduled-task results. Every reference is in -->
-      <!-- the email package; without the jar nothing changes.                      -->
-      <dependency>
-         <groupId>com.kingsrook.qbits</groupId>
-         <artifactId>qbit-email</artifactId>
-         <version>${qbit-email.version}</version>
-         <optional>true</optional>
-      </dependency>
-
       <dependency>
          <groupId>org.junit.jupiter</groupId>
          <artifactId>junit-jupiter</artifactId>
@@ -73,39 +60,6 @@
          <artifactId>archunit-junit5</artifactId>
          <scope>test</scope>
       </dependency>
-      <!-- AssistantDefaultsChangelogTest runs the shipped seed changelog against H2 (PostgreSQL mode). -->
-      <dependency>
-         <groupId>com.h2database</groupId>
-         <artifactId>h2</artifactId>
-         <version>2.3.232</version>
-         <scope>test</scope>
-      </dependency>
-      <!-- ...through real Liquibase (the version kof22 runs), so preconditions and bookkeeping are exercised. -->
-      <dependency>
-         <groupId>org.liquibase</groupId>
-         <artifactId>liquibase-core</artifactId>
-         <version>4.33.0</version>
-         <scope>test</scope>
-      </dependency>
-      <!-- the reference DDL guardrail (SchemaForeignKeyPostgresTest) -->
-      <dependency>
-         <groupId>org.testcontainers</groupId>
-         <artifactId>junit-jupiter</artifactId>
-         <version>1.21.4</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.testcontainers</groupId>
-         <artifactId>postgresql</artifactId>
-         <version>1.21.4</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.postgresql</groupId>
-         <artifactId>postgresql</artifactId>
-         <version>42.7.14</version>
-         <scope>test</scope>
-      </dependency>
    </dependencies>
 
    <build>

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/AssistantQBitConfig.java

@@ -17,7 +17,6 @@
 package com.kingsrook.qbits.assistant;
 
 
-import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -29,18 +28,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Pattern;
+import javax.net.ssl.SSLContext;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.kingsrook.qbits.assistant.classification.ClassificationSource;
 import com.kingsrook.qbits.assistant.classification.ConfiguredClassificationSource;
-import com.kingsrook.qbits.assistant.jobs.AssistantRunTracker;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
+import com.kingsrook.qbits.assistant.engine.ModelPricing;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.TrustedCaBundle;
 import com.kingsrook.qbits.assistant.rag.VectorStore;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
-import com.kingsrook.qbits.assistant.spi.ModelPricing;
-import com.kingsrook.qbits.assistant.spi.TrustedCaBundle;
 import com.kingsrook.qbits.assistant.uiapi.UiApiGateway;
 import com.kingsrook.qqq.backend.core.actions.ai.AiExposure;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.producers.MetaDataCustomizerInterface;
 import com.kingsrook.qqq.backend.core.model.metadata.qbits.QBitConfig;
@@ -91,7 +90,6 @@ public class AssistantQBitConfig implements QBitConfig
    private String conversationEncryptionKeyEnvName;
 
    private Boolean               enabled                    = true;
-   private Boolean               recordHistory              = false;
    private String                backendName;
    private String                providerName               = DEFAULT_PROVIDER_NAME;
    private AssistantModelRouting models                     = new AssistantModelRouting();
@@ -100,29 +98,18 @@ public class AssistantQBitConfig implements QBitConfig
    private Integer               maxParallelToolCalls       = 4;
    private Integer               maxRowsToModel             = 50;
    private Integer               maxCellChars               = 500;
-   private Integer turnHeartbeatSeconds = 5;
-   private Integer turnLeaseSeconds = 45;
-   private Integer turnForceFinalizeGraceSeconds = 20;
-   private Integer shutdownGraceSeconds = 8;
-   private String defaultConcurrencyMode = "SUPERSEDE";
-   private Boolean registerShutdownHook = true;
-   private AssistantRunTracker runTracker = AssistantRunTracker.NOOP;
-
    private Integer               maxTurnSeconds             = 300;
    private Integer               maxUserMessageChars        = 8000;
    private Integer               historyMessageLimit        = 40;
    private AssistantBudgets      budgets                    = new AssistantBudgets();
    private Integer               maxTurnsPerUserPerMinute   = 10;
-   private Integer               maxConcurrentTurnsPerUser  = 3;
+   private Integer               maxConcurrentTurnsPerUser  = 1;
    private Integer               conversationRetentionDays  = 90;
    private Integer               toolResultRetentionDays    = 30;
    private Integer               approvalRetentionDays      = 365;
    private Integer               policyCacheSeconds         = 30;
    private String                ownerSecurityKeyType       = DEFAULT_OWNER_KEY_TYPE;
    private String                shortcut                   = DEFAULT_SHORTCUT;
-   private Set<String> allowedScheduledCredentialEnvNames = new LinkedHashSet<>();
-   private String scheduledTasksSchedulerName;
-
    private String                retentionSchedulerName;
    private Boolean               registerRoutes             = true;
    private Map<String, ModelPricing> pricing                = ModelPricing.defaults();
@@ -155,13 +142,11 @@ public class AssistantQBitConfig implements QBitConfig
    private Integer                   providerTestTimeoutSeconds = 30;
    private Integer                   homeMaxRows              = 20000;
    private String                    tablePathPrefix          = "/app";
-   private Boolean                   emailExternalApproved    = false;
 
    private transient MetaDataCustomizerInterface<QTableMetaData> tableMetaDataCustomizer;
    private transient Map<String, AssistantModelProvider>        modelProviders = new LinkedHashMap<>();
    private transient Map<String, AssistantProviderType>         providerTypes  = new LinkedHashMap<>();
    private transient Function<String, String>                   secretResolver = System::getenv;
-   private transient Function<String, String>                   emailRecipientResolver;
    private transient AssistantRuntime                           runtime;
 
 
@@ -215,23 +200,6 @@ public class AssistantQBitConfig implements QBitConfig
       requirePositive(errors, "maxRowsToModel", maxRowsToModel);
       requirePositive(errors, "maxCellChars", maxCellChars);
       requirePositive(errors, "maxTurnSeconds", maxTurnSeconds);
-      requirePositive(errors, "turnHeartbeatSeconds", turnHeartbeatSeconds);
-      requirePositive(errors, "turnLeaseSeconds", turnLeaseSeconds);
-      requirePositive(errors, "turnForceFinalizeGraceSeconds", turnForceFinalizeGraceSeconds);
-      requirePositive(errors, "shutdownGraceSeconds", shutdownGraceSeconds);
-      if(turnHeartbeatSeconds != null && turnLeaseSeconds != null && turnLeaseSeconds < 2 * turnHeartbeatSeconds)
-      {
-         errors.add("turnLeaseSeconds must be at least twice turnHeartbeatSeconds.");
-      }
-      if(!"SUPERSEDE".equals(defaultConcurrencyMode) && !"CONCURRENT".equals(defaultConcurrencyMode))
-      {
-         errors.add("defaultConcurrencyMode must be SUPERSEDE or CONCURRENT.");
-      }
-      if(turnHeartbeatSeconds != null && turnLeaseSeconds != null && turnHeartbeatSeconds >= turnLeaseSeconds)
-      {
-         errors.add("turnHeartbeatSeconds must be less than turnLeaseSeconds.");
-      }
-
       requirePositive(errors, "maxUserMessageChars", maxUserMessageChars);
       requirePositive(errors, "historyMessageLimit", historyMessageLimit);
       requirePositive(errors, "maxTurnsPerUserPerMinute", maxTurnsPerUserPerMinute);
@@ -246,13 +214,6 @@ public class AssistantQBitConfig implements QBitConfig
       requirePositive(errors, "killSwitchPollMillis", killSwitchPollMillis);
       requirePositive(errors, "providerTestTimeoutSeconds", providerTestTimeoutSeconds);
       requirePositive(errors, "homeMaxRows", homeMaxRows);
-      for(String name : allowedScheduledCredentialEnvNames == null ? Set.<String>of() : allowedScheduledCredentialEnvNames)
-      {
-         if(name == null || !ENV_NAME.matcher(name).matches())
-         {
-            errors.add("allowedScheduledCredentialEnvNames contains an invalid environment variable name.");
-         }
-      }
       for(String name : allowedApiKeyEnvNames == null ? Set.<String>of() : allowedApiKeyEnvNames)
       {
          if(name == null || !ENV_NAME.matcher(name).matches())
@@ -1531,62 +1492,6 @@ public class AssistantQBitConfig implements QBitConfig
 
 
 
-   /*******************************************************************************
-    ** Whether the host's EXTERNAL approval rule allows a scheduled task's result
-    ** to leave the app by email. There is no approval rule in the qbit yet (the
-    ** scheduled runner is P-g), so this explicit flag stands in; default false.
-    *******************************************************************************/
-   public Boolean getEmailExternalApproved()
-   {
-      return (this.emailExternalApproved);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for emailExternalApproved
-    *******************************************************************************/
-   public void setEmailExternalApproved(Boolean emailExternalApproved)
-   {
-      this.emailExternalApproved = emailExternalApproved;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for emailExternalApproved
-    *******************************************************************************/
-   public AssistantQBitConfig withEmailExternalApproved(Boolean emailExternalApproved)
-   {
-      this.emailExternalApproved = emailExternalApproved;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** The hook that turns a task owner's user id into an email address; null
-    ** means the default (an owner id that already is an address).
-    *******************************************************************************/
-   @JsonIgnore
-   public Function<String, String> getEmailRecipientResolver()
-   {
-      return (emailRecipientResolver);
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for emailRecipientResolver
-    *******************************************************************************/
-   public AssistantQBitConfig withEmailRecipientResolver(Function<String, String> emailRecipientResolver)
-   {
-      this.emailRecipientResolver = emailRecipientResolver;
-      return (this);
-   }
-
-
-
    /*******************************************************************************
     ** Getter for allowedApiKeyEnvNames (extra API key environment variable names a provider row may reference)
     *******************************************************************************/
@@ -1785,28 +1690,6 @@ public class AssistantQBitConfig implements QBitConfig
 
 
 
-   /*******************************************************************************
-    ** Whether the host opts into record history; false by default.
-    *******************************************************************************/
-   public Boolean getRecordHistory()
-   {
-      return (recordHistory);
-   }
-
-
-
-   /*******************************************************************************
-    ** Owner decision — hard wall: record history requires explicit host opt-in.
-    ** kof22 does not opt in. The user's own audit permissions still apply.
-    *******************************************************************************/
-   public AssistantQBitConfig withRecordHistory(boolean recordHistory)
-   {
-      this.recordHistory = recordHistory;
-      return (this);
-   }
-
-
-
    /*******************************************************************************
     ** Getter for hipaaMode
     *******************************************************************************/
@@ -1972,285 +1855,4 @@ public class AssistantQBitConfig implements QBitConfig
       this.vectorStore = vectorStore;
       return (this);
    }
-
-
-
-   /*******************************************************************************
-    ** Getter for allowedScheduledCredentialEnvNames
-    *******************************************************************************/
-   public Set<String> getAllowedScheduledCredentialEnvNames()
-   {
-      return (allowedScheduledCredentialEnvNames);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for allowedScheduledCredentialEnvNames
-    *******************************************************************************/
-   public void setAllowedScheduledCredentialEnvNames(Set<String> allowedScheduledCredentialEnvNames)
-   {
-      this.allowedScheduledCredentialEnvNames = allowedScheduledCredentialEnvNames;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for allowedScheduledCredentialEnvNames
-    *******************************************************************************/
-   public AssistantQBitConfig withAllowedScheduledCredentialEnvNames(Set<String> allowedScheduledCredentialEnvNames)
-   {
-      this.allowedScheduledCredentialEnvNames = allowedScheduledCredentialEnvNames;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for scheduledTasksSchedulerName
-    *******************************************************************************/
-   public String getScheduledTasksSchedulerName()
-   {
-      return (scheduledTasksSchedulerName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for scheduledTasksSchedulerName
-    *******************************************************************************/
-   public void setScheduledTasksSchedulerName(String scheduledTasksSchedulerName)
-   {
-      this.scheduledTasksSchedulerName = scheduledTasksSchedulerName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for scheduledTasksSchedulerName
-    *******************************************************************************/
-   public AssistantQBitConfig withScheduledTasksSchedulerName(String scheduledTasksSchedulerName)
-   {
-      this.scheduledTasksSchedulerName = scheduledTasksSchedulerName;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for turnHeartbeatSeconds
-    *******************************************************************************/
-   public Integer getTurnHeartbeatSeconds()
-   {
-      return (this.turnHeartbeatSeconds);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for turnHeartbeatSeconds
-    *******************************************************************************/
-   public void setTurnHeartbeatSeconds(Integer turnHeartbeatSeconds)
-   {
-      this.turnHeartbeatSeconds = turnHeartbeatSeconds;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for turnHeartbeatSeconds
-    *******************************************************************************/
-   public AssistantQBitConfig withTurnHeartbeatSeconds(Integer turnHeartbeatSeconds)
-   {
-      this.turnHeartbeatSeconds = turnHeartbeatSeconds;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for turnLeaseSeconds
-    *******************************************************************************/
-   public Integer getTurnLeaseSeconds()
-   {
-      return (this.turnLeaseSeconds);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for turnLeaseSeconds
-    *******************************************************************************/
-   public void setTurnLeaseSeconds(Integer turnLeaseSeconds)
-   {
-      this.turnLeaseSeconds = turnLeaseSeconds;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for turnLeaseSeconds
-    *******************************************************************************/
-   public AssistantQBitConfig withTurnLeaseSeconds(Integer turnLeaseSeconds)
-   {
-      this.turnLeaseSeconds = turnLeaseSeconds;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for turnForceFinalizeGraceSeconds
-    *******************************************************************************/
-   public Integer getTurnForceFinalizeGraceSeconds()
-   {
-      return (this.turnForceFinalizeGraceSeconds);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for turnForceFinalizeGraceSeconds
-    *******************************************************************************/
-   public void setTurnForceFinalizeGraceSeconds(Integer turnForceFinalizeGraceSeconds)
-   {
-      this.turnForceFinalizeGraceSeconds = turnForceFinalizeGraceSeconds;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for turnForceFinalizeGraceSeconds
-    *******************************************************************************/
-   public AssistantQBitConfig withTurnForceFinalizeGraceSeconds(Integer turnForceFinalizeGraceSeconds)
-   {
-      this.turnForceFinalizeGraceSeconds = turnForceFinalizeGraceSeconds;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for shutdownGraceSeconds
-    *******************************************************************************/
-   public Integer getShutdownGraceSeconds()
-   {
-      return (this.shutdownGraceSeconds);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for shutdownGraceSeconds
-    *******************************************************************************/
-   public void setShutdownGraceSeconds(Integer shutdownGraceSeconds)
-   {
-      this.shutdownGraceSeconds = shutdownGraceSeconds;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for shutdownGraceSeconds
-    *******************************************************************************/
-   public AssistantQBitConfig withShutdownGraceSeconds(Integer shutdownGraceSeconds)
-   {
-      this.shutdownGraceSeconds = shutdownGraceSeconds;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for defaultConcurrencyMode
-    *******************************************************************************/
-   public String getDefaultConcurrencyMode()
-   {
-      return (this.defaultConcurrencyMode);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for defaultConcurrencyMode
-    *******************************************************************************/
-   public void setDefaultConcurrencyMode(String defaultConcurrencyMode)
-   {
-      this.defaultConcurrencyMode = defaultConcurrencyMode;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for defaultConcurrencyMode
-    *******************************************************************************/
-   public AssistantQBitConfig withDefaultConcurrencyMode(String defaultConcurrencyMode)
-   {
-      this.defaultConcurrencyMode = defaultConcurrencyMode;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for registerShutdownHook
-    *******************************************************************************/
-   public Boolean getRegisterShutdownHook()
-   {
-      return (this.registerShutdownHook);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for registerShutdownHook
-    *******************************************************************************/
-   public void setRegisterShutdownHook(Boolean registerShutdownHook)
-   {
-      this.registerShutdownHook = registerShutdownHook;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for registerShutdownHook
-    *******************************************************************************/
-   public AssistantQBitConfig withRegisterShutdownHook(Boolean registerShutdownHook)
-   {
-      this.registerShutdownHook = registerShutdownHook;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for runTracker
-    *******************************************************************************/
-   @JsonIgnore
-   public AssistantRunTracker getRunTracker()
-   {
-      return (this.runTracker == null ? AssistantRunTracker.NOOP : this.runTracker);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for runTracker
-    *******************************************************************************/
-   public void setRunTracker(AssistantRunTracker runTracker)
-   {
-      this.runTracker = runTracker;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for runTracker
-    *******************************************************************************/
-   public AssistantQBitConfig withRunTracker(AssistantRunTracker runTracker)
-   {
-      this.runTracker = runTracker;
-      return (this);
-   }
-
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/AssistantQBitProducer.java

@@ -21,30 +21,22 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-import com.kingsrook.qbits.assistant.api.AssistantRoutes;
-import com.kingsrook.qbits.assistant.developer.AssistantDeveloperPanels;
 import com.kingsrook.qbits.assistant.home.AssistantAccessWidget;
 import com.kingsrook.qbits.assistant.home.AssistantHome;
-import com.kingsrook.qbits.assistant.metadata.AssistantChannelWall;
-import com.kingsrook.qbits.assistant.metadata.AssistantHelp;
-import com.kingsrook.qbits.assistant.metadata.AssistantInstanceMetaData;
 import com.kingsrook.qbits.assistant.metadata.AssistantMetaDataBuilder;
 import com.kingsrook.qbits.assistant.metadata.AssistantRecordScreens;
-import com.kingsrook.qbits.assistant.model.AssistantBudget;
-import com.kingsrook.qbits.assistant.processes.DataAccessDefaultsProcess;
 import com.kingsrook.qbits.assistant.processes.DiscoverModelsProcess;
 import com.kingsrook.qbits.assistant.processes.KnowledgeIndexProcess;
-import com.kingsrook.qbits.assistant.processes.ScheduledTaskProcess;
 import com.kingsrook.qbits.assistant.processes.TestConnectionProcess;
 import com.kingsrook.qbits.assistant.processes.TestModelConnectionProcess;
 import com.kingsrook.qqq.backend.core.alerts.AlertSeverity;
 import com.kingsrook.qqq.backend.core.alerts.QAlertTypeMetaData;
+import com.kingsrook.qbits.assistant.model.AssistantBudget;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.metadata.MetaDataProducerMultiOutput;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.permissions.ClientChannelsMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.qbits.QBitMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.qbits.QBitMetaDataProducer;
@@ -182,7 +174,7 @@ public class AssistantQBitProducer implements QBitMetaDataProducer<AssistantQBit
       QProcessMetaData testConnection = TestConnectionProcess.process();
       testConnection.setSourceQBitName(qBitMetaData.getName());
       qInstance.addProcess(testConnection);
-      for(QProcessMetaData process : List.of(DiscoverModelsProcess.process(), TestModelConnectionProcess.process(), DataAccessDefaultsProcess.process()))
+      for(QProcessMetaData process : java.util.List.of(DiscoverModelsProcess.process(), TestModelConnectionProcess.process()))
       {
          process.setSourceQBitName(qBitMetaData.getName());
          qInstance.addProcess(process);
@@ -194,58 +186,18 @@ public class AssistantQBitProducer implements QBitMetaDataProducer<AssistantQBit
          qInstance.addProcess(process);
       }
 
-      for(QProcessMetaData process : ScheduledTaskProcess.processes(qBitConfig))
-      {
-         process.setSourceQBitName(qBitMetaData.getName());
-         qInstance.addProcess(process);
-      }
       qInstance.addWidget(AssistantHome.widget());
       qInstance.addWidget(AssistantAccessWidget.widget());
 
       QAppMetaData app = builder.buildAdminApp(tables);
       qInstance.addApp(app);
-      AssistantHelp.apply(qInstance);
 
-      AssistantChannelWall.register(qInstance);
-      if(Boolean.TRUE.equals(qBitConfig.getRecordHistory()))
-      {
-         enableRecordHistory(ClientChannelsMetaData.ofOrWithNew(qInstance));
-      }
-      else
-      {
-         ClientChannelsMetaData.ofOrWithNew(qInstance).withDeniedPattern("assistant", "audit*");
-      }
       postProduceActions(new MetaDataProducerMultiOutput(), qInstance);
       return (new MetaDataProducerMultiOutput());
    }
 
 
 
-   /*******************************************************************************
-    ** STAND-IN(core=QRun-IO/qqq#1193, removeBy=RC.8): call withAssistantAuditReads() directly once the qbit builds on a QQQ RC that has it
-    *******************************************************************************/
-   private void enableRecordHistory(ClientChannelsMetaData channels)
-   {
-      try
-      {
-         channels.getClass().getMethod("withAssistantAuditReads").invoke(channels);
-      }
-      catch(NoSuchMethodException e)
-      {
-         List<String> denied = channels.getDeniedPatterns().get("assistant");
-         if(denied != null)
-         {
-            denied.removeIf("audit*"::equals);
-         }
-      }
-      catch(ReflectiveOperationException e)
-      {
-         throw (new IllegalStateException("Could not enable assistant audit reads.", e));
-      }
-   }
-
-
-
    /*******************************************************************************
     ** Declare budget alerts as top-level core metadata for admin visibility.
     *******************************************************************************/
@@ -274,19 +226,19 @@ public class AssistantQBitProducer implements QBitMetaDataProducer<AssistantQBit
       boolean routes = false;
       if(Boolean.TRUE.equals(qBitConfig.getRegisterRoutes()) && isJavalinAvailable())
       {
-         AssistantRoutes.register(qInstance);
+         com.kingsrook.qbits.assistant.api.AssistantRoutes.register(qInstance);
          routes = true;
       }
 
       if(qBitConfig.isEffectivelyEnabled())
       {
-         AssistantInstanceMetaData.register(qInstance);
+         com.kingsrook.qbits.assistant.metadata.AssistantInstanceMetaData.register(qInstance);
       }
 
       boolean developerPanel = false;
-      if(AssistantDeveloperPanels.isContractAvailable())
+      if(com.kingsrook.qbits.assistant.developer.AssistantDeveloperPanels.isContractAvailable())
       {
-         AssistantDeveloperPanels.register(qInstance);
+         com.kingsrook.qbits.assistant.developer.AssistantDeveloperPanels.register(qInstance);
          developerPanel = true;
       }
 

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/AssistantRuntime.java

@@ -17,11 +17,8 @@
 package com.kingsrook.qbits.assistant;
 
 
-import java.net.InetAddress;
 import java.time.Clock;
-import java.time.Duration;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -35,25 +32,19 @@ import com.kingsrook.qbits.assistant.engine.ProfileService;
 import com.kingsrook.qbits.assistant.engine.ProviderService;
 import com.kingsrook.qbits.assistant.engine.RateLimiter;
 import com.kingsrook.qbits.assistant.engine.RunningTurn;
-import com.kingsrook.qbits.assistant.metadata.AssistantChannelWall;
 import com.kingsrook.qbits.assistant.persistence.AssistantStore;
 import com.kingsrook.qbits.assistant.rag.InMemoryVectorStore;
 import com.kingsrook.qbits.assistant.rag.RagService;
 import com.kingsrook.qbits.assistant.rag.VectorStore;
-import com.kingsrook.qbits.assistant.scheduled.ScheduledTurn;
 import com.kingsrook.qbits.assistant.tools.KnowledgeTool;
-import com.kingsrook.qbits.assistant.tools.UiApiToolbox;
 import com.kingsrook.qbits.assistant.tools.bulkload.BulkLoadTools;
-import com.kingsrook.qbits.assistant.uiapi.CoreUiApiGateway;
-import com.kingsrook.qbits.assistant.uiapi.UiApiCall;
+import com.kingsrook.qbits.assistant.tools.UiApiToolbox;
+import com.kingsrook.qbits.assistant.uiapi.LoopbackUiApiGateway;
 import com.kingsrook.qbits.assistant.uiapi.UiApiGateway;
-import com.kingsrook.qbits.assistant.uiapi.UiApiResult;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolKernel;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolKernelSettings;
 import com.kingsrook.qqq.backend.core.actions.ai.exposure.AiExposurePolicy;
 import com.kingsrook.qqq.backend.core.actions.ai.output.AiRedactor;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.qbits.QBitMetaData;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
@@ -66,13 +57,6 @@ import com.kingsrook.qqq.backend.core.utils.StringUtils;
  *******************************************************************************/
 public class AssistantRuntime
 {
-   private static final QLogger LOG = QLogger.getLogger(AssistantRuntime.class);
-   private final String instanceId = instanceId();
-   private volatile boolean shuttingDown;
-   private Thread shutdownHook;
-
-   private final ScheduledTurn scheduledTurn = new ScheduledTurn();
-
    private final RagService ragService;
    private final KnowledgeTool knowledgeTool;
    private final BulkLoadTools bulkLoadTools;
@@ -113,21 +97,10 @@ public class AssistantRuntime
     *******************************************************************************/
    public AssistantRuntime(QInstance qInstance, AssistantQBitConfig config, Clock clock)
    {
-      this(qInstance, config, clock, new AssistantStore(config));
-   }
-
-
-
-   /*******************************************************************************
-    ** Explicit persistence collaborator for embedded runtimes and fault tests.
-    *******************************************************************************/
-   public AssistantRuntime(QInstance qInstance, AssistantQBitConfig config, Clock clock, AssistantStore store)
-   {
-      AssistantChannelWall.validate(qInstance);
       this.qInstance = qInstance;
       this.config = config;
       this.clock = clock;
-      this.store = store;
+      this.store = new AssistantStore(config);
       this.policyService = new PolicyService(config, store, clock);
       this.providerService = new ProviderService(config, store, clock);
       this.budgetService = new BudgetService(store, providerService, clock);
@@ -141,56 +114,12 @@ public class AssistantRuntime
       this.accessExplainer = new AccessExplainer(qInstance, dataAccessService);
       this.toolbox = new UiApiToolbox(qInstance, dataAccessService, exposurePolicy, new AiRedactor(settings.getCustomRedactionPatterns()),
          config.getMaxCellChars() == null ? AiToolKernelSettings.DEFAULT_MAX_CELL_CHARS : config.getMaxCellChars());
-      UiApiGateway delegate = config.getUiApiGateway() != null ? config.getUiApiGateway() : new CoreUiApiGateway(this::uiApiBaseUrl, qInstance);
-      this.uiApiGateway = new UiApiGateway()
-      {
-         /*******************************************************************************
-          ** Delegate using this instance's configured collaborator.
-          *******************************************************************************/
-         @Override
-         public boolean isInvocable(String method, String pathTemplate)
-         {
-            return (delegate.isInvocable(method, pathTemplate));
-         }
-
-         /*******************************************************************************
-          ** Delegate using this instance's configured collaborator.
-          *******************************************************************************/
-         @Override
-         public UiApiResult invoke(UiApiCall call) throws QException
-         {
-            String channel = scheduledTurn.channel(call.getSessionUUID());
-            if(channel != null)
-            {
-               if(!(delegate instanceof CoreUiApiGateway))
-               {
-                  throw (new QException("Scheduled tasks require the core UI API gateway for client attribution."));
-               }
-               call.withClientDetail(channel.substring(CoreUiApiGateway.CLIENT_CHANNEL.length() + 1));
-            }
-            return (delegate.invoke(call));
-         }
-      };
+      this.uiApiGateway = config.getUiApiGateway() != null ? config.getUiApiGateway() : new LoopbackUiApiGateway(this::uiApiBaseUrl, qInstance);
       VectorStore vectors = config.getVectorStore() == null ? new InMemoryVectorStore() : config.getVectorStore();
       this.ragService = new RagService(this, vectors);
       this.knowledgeTool = new KnowledgeTool(this, ragService, vectors);
       this.bulkLoadTools = new BulkLoadTools(qInstance, dataAccessService, config.getBulkLoadRunner());
       this.contextBuilder = new ContextBuilder(config, kernel, toolbox).withKnowledgeTool(knowledgeTool).withBulkLoadTools(bulkLoadTools);
-      if(Boolean.TRUE.equals(config.getRegisterShutdownHook()))
-      {
-         shutdownHook = new Thread(() ->
-         {
-            try
-            {
-               shutdown(Duration.ofSeconds(config.getShutdownGraceSeconds()));
-            }
-            catch(Throwable ignored)
-            {
-               // Shutdown must never fail the JVM hook.
-            }
-         }, "assistant-shutdown-" + instanceId);
-         Runtime.getRuntime().addShutdownHook(shutdownHook);
-      }
    }
 
 
@@ -346,13 +275,8 @@ public class AssistantRuntime
    /*******************************************************************************
     ** Track a turn running here.
     *******************************************************************************/
-   public synchronized RunningTurn register(RunningTurn turn)
+   public RunningTurn register(RunningTurn turn)
    {
-      if(shuttingDown)
-      {
-         turn.forceFinalize("SHUTDOWN");
-         return (turn);
-      }
       runningTurns.put(turn.getTurnId(), turn);
       return (turn);
    }
@@ -384,17 +308,7 @@ public class AssistantRuntime
     *******************************************************************************/
    public void cancelAll(String reason)
    {
-      runningTurns.values().forEach(t ->
-      {
-         try
-         {
-            t.cancel(reason);
-         }
-         catch(Exception e)
-         {
-            LOG.warn("Assistant cancellation failed; finalization will still run");
-         }
-      });
+      runningTurns.values().forEach(t -> t.cancel(reason));
    }
 
 
@@ -404,7 +318,8 @@ public class AssistantRuntime
     *******************************************************************************/
    public void close()
    {
-      shutdown(Duration.ZERO);
+      runningTurns.values().forEach(t -> t.cancel("SHUTDOWN"));
+      executor.shutdownNow();
    }
 
 
@@ -535,13 +450,6 @@ public class AssistantRuntime
       return (knowledgeTool);
    }
 
-   /*******************************************************************************
-    ** Server-owned scheduled execution context.
-    *******************************************************************************/
-   public ScheduledTurn getScheduledTurn()
-   {
-      return (scheduledTurn);
-   }
 
 
    /*******************************************************************************
@@ -552,97 +460,4 @@ public class AssistantRuntime
       return (bulkLoadTools);
    }
 
-
-
-
-   /*******************************************************************************
-    ** Stop accepting work, cancel, wait a bounded grace, then force finalization.
-    *******************************************************************************/
-   public void shutdown(Duration grace)
-   {
-      synchronized(this)
-      {
-         shuttingDown = true;
-      }
-      cancelAll("SHUTDOWN");
-      long until = System.nanoTime() + Math.max(0, grace.toNanos());
-      while(!runningTurns.isEmpty() && System.nanoTime() < until)
-      {
-         try
-         {
-            Thread.sleep(10);
-         }
-         catch(InterruptedException e)
-         {
-            Thread.currentThread().interrupt();
-            break;
-         }
-      }
-      runningTurns.values().forEach(t ->
-      {
-         try
-         {
-            t.forceFinalize("SHUTDOWN");
-         }
-         catch(Exception e)
-         {
-            LOG.warn("Assistant shutdown finalization failed");
-         }
-      });
-      executor.shutdownNow();
-      if(shutdownHook != null && Thread.currentThread() != shutdownHook)
-      {
-         try
-         {
-            Runtime.getRuntime().removeShutdownHook(shutdownHook);
-         }
-         catch(IllegalStateException ignored)
-         {
-            // The JVM is already shutting down.
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for shuttingDown
-    *******************************************************************************/
-   public boolean isShuttingDown()
-   {
-      return (shuttingDown);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for instanceId
-    *******************************************************************************/
-   public String getInstanceId()
-   {
-      return (instanceId);
-   }
-
-
-
-   /*******************************************************************************
-    ** A stable, bounded hostname plus a per-runtime random suffix.
-    *******************************************************************************/
-   private static String instanceId()
-   {
-      String host = System.getenv("HOSTNAME");
-      if(!StringUtils.hasContent(host))
-      {
-         try
-         {
-            host = InetAddress.getLocalHost().getHostName();
-         }
-         catch(Exception ignored)
-         {
-            host = "unknown";
-         }
-      }
-      return (host.substring(0, Math.min(87, host.length())) + ":" + UUID.randomUUID().toString().substring(0, 8));
-   }
-
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/access/AccessExplainer.java

@@ -31,7 +31,6 @@ import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
-import com.kingsrook.qqq.middleware.javalin.specs.invoke.UiApiCredentials;
 
 
 /*******************************************************************************
@@ -93,27 +92,7 @@ public class AccessExplainer
     *******************************************************************************/
    public List<TableAccess> explain(UiApiGateway gateway, String sessionUUID, PolicyService.ToolPolicy policy, String tableName, String prompt) throws QException
    {
-      return (explain(gateway, sessionUUID, null, policy, tableName, prompt));
-   }
-
-
-
-   /*******************************************************************************
-    ** Explain, with the caller's request credentials when they are known.
-    *******************************************************************************/
-   public List<TableAccess> explain(UiApiGateway gateway, String sessionUUID, UiApiCredentials credentials, PolicyService.ToolPolicy policy, String tableName, String prompt) throws QException
-   {
-      return (explain(gateway, sessionUUID, credentials, policy, tableName, prompt, null));
-   }
-
-
-
-   /*******************************************************************************
-    ** Preserve a known turn's attribution on the metadata request.
-    *******************************************************************************/
-   public List<TableAccess> explain(UiApiGateway gateway, String sessionUUID, UiApiCredentials credentials, PolicyService.ToolPolicy policy, String tableName, String prompt, String turnId) throws QException
-   {
-      UiApiResult response = gateway.invoke(new UiApiCall("GET", "/metaData").withSessionUUID(sessionUUID).withCredentials(credentials).withInvokedBy("assistant-explain").withClientDetail(turnId));
+      UiApiResult response = gateway.invoke(new UiApiCall("GET", "/metaData").withSessionUUID(sessionUUID).withInvokedBy("assistant-explain"));
       if(!response.isSuccess())
       {
          throw (new QException("GET /metaData answered HTTP " + response.status() + (response.errorMessage() == null ? "" : ": " + response.errorMessage())));

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/api/AssistantApi.java

@@ -17,14 +17,11 @@
 package com.kingsrook.qbits.assistant.api;
 
 
-import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
@@ -48,20 +45,16 @@ import com.kingsrook.qbits.assistant.model.AssistantToolCall;
 import com.kingsrook.qbits.assistant.model.AssistantTurn;
 import com.kingsrook.qbits.assistant.model.AssistantTurnEvent;
 import com.kingsrook.qbits.assistant.persistence.AssistantStore;
-import com.kingsrook.qbits.assistant.persistence.TranscriptRedactor;
 import com.kingsrook.qbits.assistant.tools.UiApiToolbox;
 import com.kingsrook.qbits.assistant.tools.bulkload.BulkLoadTools;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolOutcome;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolResult;
 import com.kingsrook.qqq.backend.core.actions.ai.output.AiRedactor;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 import com.kingsrook.qqq.backend.core.model.session.QSession;
 import com.kingsrook.qqq.backend.core.utils.JsonUtils;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
-import com.kingsrook.qqq.middleware.javalin.specs.invoke.UiApiCredentials;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
 /*******************************************************************************
@@ -71,8 +64,6 @@ import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
  *******************************************************************************/
 public class AssistantApi
 {
-   private static final QLogger LOG = QLogger.getLogger(AssistantApi.class);
-
    public static final int TITLE_MAX_CHARS = 60;
 
    private final AssistantRuntime    runtime;
@@ -80,7 +71,6 @@ public class AssistantApi
    private final AssistantStore      store;
    private final QSession            session;
    private final String              userId;
-   private UiApiCredentials          credentials;
 
 
 
@@ -103,18 +93,6 @@ public class AssistantApi
 
 
 
-   /*******************************************************************************
-    ** The credentials of the request this API serves, exactly as they came in;
-    ** the tools forward them to the UI API. Never logged.
-    *******************************************************************************/
-   public AssistantApi withCredentials(UiApiCredentials credentials)
-   {
-      this.credentials = credentials;
-      return (this);
-   }
-
-
-
    /*******************************************************************************
     ** GET /config - the feature probe. Never throws for a signed-in user.
     *******************************************************************************/
@@ -297,19 +275,6 @@ public class AssistantApi
    public RunningTurn startTurn(Integer conversationId, Map<String, Object> body) throws QException, AssistantApiException
    {
       requireAccess();
-      if(runtime.isShuttingDown())
-      {
-         throw (new AssistantApiException(503, "SHUTTING_DOWN", "The server is restarting. Try again in a moment."));
-      }
-      String concurrency = config.getDefaultConcurrencyMode();
-      if(body.containsKey("concurrency"))
-      {
-         if(!(body.get("concurrency") instanceof String mode) || !("supersede".equalsIgnoreCase(mode) || "concurrent".equalsIgnoreCase(mode)))
-         {
-            throw (new AssistantApiException(400, "concurrency must be supersede or concurrent."));
-         }
-         concurrency = mode.toUpperCase(Locale.ROOT);
-      }
       AssistantConversation conversation = requireConversation(conversationId);
 
       if(!(body.get("text") instanceof String text) || !StringUtils.hasContent(text))
@@ -345,43 +310,30 @@ public class AssistantApi
          throw (new AssistantApiException(429, "BUDGET", budget.message()));
       }
 
+      long running = 0;
+      for(AssistantTurn other : store.listRunningTurns(userId))
+      {
+         if(isRunning(reapIfOrphaned(other)))
+         {
+            running++;
+         }
+      }
+      if(running >= config.getMaxConcurrentTurnsPerUser())
+      {
+         throw (new AssistantApiException(429, "RATE_LIMIT", "You already have an assistant answer in progress. Wait for it to finish or stop it."));
+      }
+
       String limited = runtime.getRateLimiter().tryAcquire(userId, config.getMaxTurnsPerUserPerMinute(), config.getMaxConcurrentTurnsPerUser());
       if(limited != null)
       {
          throw (new AssistantApiException(429, "RATE_LIMIT", limited));
       }
 
-      List<AssistantTurn> remaining = new ArrayList<>();
-      for(AssistantTurn other : store.listRunningTurns(userId))
-      {
-         other = reapIfOrphaned(other);
-         if(!isRunning(other) || "SUPERSEDED".equals(other.getCancelReason()))
-         {
-            continue;
-         }
-         if("SUPERSEDE".equals(concurrency) && conversationId.equals(other.getConversationId()))
-         {
-            requestStop(other, "SUPERSEDED");
-         }
-         else
-         {
-            remaining.add(other);
-         }
-      }
-      remaining.sort(Comparator.comparing(AssistantTurn::getStartedAt, Comparator.nullsFirst(Comparator.naturalOrder()))
-         .thenComparing(AssistantTurn::getId));
-      while(remaining.size() >= config.getMaxConcurrentTurnsPerUser())
-      {
-         requestStop(remaining.removeFirst(), "SUPERSEDED");
-      }
-
-      TranscriptRedactor transcript = new TranscriptRedactor(runtime.getQInstance(), config.getClassificationSource());
-      transcript.attach();
       try
       {
          if(!StringUtils.hasContent(conversation.getTitle()))
          {
-            String title = text;
+            String title = deriveTitle(text);
             store.updateFields(AssistantConversation.TABLE_NAME, new QRecord().withValue("id", conversationId).withValue("title", title));
             conversation.setTitle(title);
          }
@@ -395,18 +347,13 @@ public class AssistantApi
             .withSeq(seq)
             .withPartsJson(new MessageParts().addText(text).toJson()));
 
-         Instant startedAt = runtime.getClock().instant();
          AssistantTurn turn = store.insert(new AssistantTurn()
             .withConversationId(conversationId)
             .withUserId(userId)
             .withUserMessageId(userMessage.getId())
             .withStatus("RUNNING")
             .withModel(active.model())
-            .withStartedAt(startedAt)
-            .withHeartbeatAt(startedAt)
-            .withLeaseOwner(runtime.getInstanceId())
-            .withPhase("starting")
-            .withConcurrencyMode(concurrency)
+            .withStartedAt(runtime.getClock().instant())
             .withToolCallCount(0)
             .withModelCallCount(0));
 
@@ -424,49 +371,17 @@ public class AssistantApi
          store.updateFields(AssistantTurn.TABLE_NAME, new QRecord().withValue("id", turn.getId()).withValue("assistantMessageId", assistantMessage.getId()));
          turn.setAssistantMessageId(assistantMessage.getId());
 
-         RunningTurn runningTurn = new RunningTurn(turn.getId(), userId);
+         RunningTurn runningTurn = runtime.register(new RunningTurn(turn.getId(), userId));
          TurnEngine  engine      = new TurnEngine(runtime, session, userId, conversation, userMessage, assistantMessage, turn, text, pageContext, policy, runningTurn,
-            budget.softExceeded() ? budget.message() : null).withCredentials(credentials).withTranscript(transcript);
-         try
-         {
-            if(config.getRunTracker() != null)
-            {
-               ///////////////////////////////////////////////////////////////////
-               // never the conversation title: it is derived from the prompt  //
-               ///////////////////////////////////////////////////////////////////
-               runningTurn.setTrackingId(config.getRunTracker().start(userId, turn.getId(), conversationId, "Assistant answer"));
-               config.getRunTracker().onCancel(runningTurn.getTrackingId(), () -> runningTurn.cancel("USER"));
-            }
-         }
-         catch(Exception e)
-         {
-            LOG.warn("Assistant run tracker start failed", logPair("turnId", turn.getId()));
-         }
-         runtime.register(runningTurn);
-         if(!runningTurn.isFinalized())
-         {
-            try
-            {
-               runtime.getExecutor().submit(engine);
-            }
-            catch(RuntimeException e)
-            {
-               runningTurn.forceFinalize("SHUTDOWN");
-               throw (e);
-            }
-         }
+            budget.softExceeded() ? budget.message() : null);
+         runtime.getExecutor().submit(engine);
          return (runningTurn);
       }
       catch(QException | RuntimeException e)
       {
-         transcript.close();
          runtime.getRateLimiter().release(userId);
          throw (e);
       }
-      finally
-      {
-         TranscriptRedactor.detach();
-      }
    }
 
 
@@ -514,94 +429,22 @@ public class AssistantApi
    {
       requireAccess();
       AssistantTurn turn = requireTurn(turnId);
-      if(isRunning(turn))
-      {
-         turn = requestStop(turn, "USER");
-      }
-      return (Map.of("status", turn.getStatus()));
-   }
-
-
-
-   /*******************************************************************************
-    ** Durable Stop, shared by the API and superseding another question.
-    *******************************************************************************/
-   private AssistantTurn requestStop(AssistantTurn turn, String reason) throws QException
-   {
-      synchronized(store)
-      {
-         turn = store.getTurn(userId, turn.getId());
-         if(!isRunning(turn))
-         {
-            return (turn);
-         }
-         RunningTurn live = runtime.getRunningTurn(turn.getId());
-         if(live == null && orphaned(turn))
-         {
-            return (reap(turn, reason));
-         }
-         Instant now = runtime.getClock().instant();
-         if(!store.updateRunningTurn(userId, new QRecord().withValue("id", turn.getId())
-            .withValue("status", "CANCELLING").withValue("cancelReason", reason).withValue("cancelRequestedAt", now)))
-         {
-            return (store.getTurn(userId, turn.getId()));
-         }
-         turn.setStatus("CANCELLING");
-         turn.setCancelReason(reason);
-         turn.setCancelRequestedAt(now);
-         if(live != null)
-         {
-            try
-            {
-               live.cancel(reason);
-            }
-            catch(Exception e)
-            {
-               LOG.warn("Assistant stream cancellation failed; watchdog will finalize");
-            }
-         }
-         return (turn);
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** GET /turns/active: the caller's runs, newest first, after orphan recovery.
-    *******************************************************************************/
-   public Map<String, Object> activeTurns() throws QException, AssistantApiException
-   {
-      requireAccess();
-      List<AssistantTurn> turns = new ArrayList<>();
-      for(AssistantTurn turn : store.listRunningTurns(userId))
+      if(runtime.getRunningTurn(turnId) == null)
       {
          turn = reapIfOrphaned(turn);
-         if(isRunning(turn))
-         {
-            turns.add(turn);
-         }
       }
-      turns.sort(Comparator.comparing(AssistantTurn::getStartedAt, Comparator.nullsFirst(Comparator.naturalOrder()))
-         .thenComparing(AssistantTurn::getId).reversed());
-      List<Map<String, Object>> rows = new ArrayList<>();
-      for(AssistantTurn turn : turns)
+      if(!isRunning(turn))
       {
-         RunningTurn live = runtime.getRunningTurn(turn.getId());
-         Map<String, Object> row = new LinkedHashMap<>();
-         row.put("turnId", turn.getId());
-         row.put("conversationId", turn.getConversationId());
-         row.put("assistantMessageId", turn.getAssistantMessageId());
-         row.put("userMessageId", turn.getUserMessageId());
-         row.put("status", turn.getStatus());
-         row.put("phase", live == null ? turn.getPhase() : live.getPhase());
-         row.put("startedAt", turn.getStartedAt() == null ? null : turn.getStartedAt().toString());
-         row.put("heartbeatAt", turn.getHeartbeatAt() == null ? null : turn.getHeartbeatAt().toString());
-         row.put("elapsedMs", turn.getStartedAt() == null ? 0 : Math.max(0, Duration.between(turn.getStartedAt(), runtime.getClock().instant()).toMillis()));
-         row.put("live", live != null);
-         row.put("concurrencyMode", turn.getConcurrencyMode());
-         rows.add(row);
+         throw (new AssistantApiException(409, "This answer has already finished."));
       }
-      return (Map.of("turns", rows));
+
+      store.updateFields(AssistantTurn.TABLE_NAME, new QRecord().withValue("id", turnId).withValue("status", "CANCELLING"));
+      RunningTurn live = runtime.getRunningTurn(turnId);
+      if(live != null && userId.equals(live.getUserId()))
+      {
+         live.cancel("USER");
+      }
+      return (Map.of("status", "CANCELLING"));
    }
 
 
@@ -617,106 +460,60 @@ public class AssistantApi
 
 
    /*******************************************************************************
-    ** A remote run loses its lease, exceeds the absolute deadline, or has a
-    ** cancellation request that its owner did not acknowledge in time.
-    *******************************************************************************/
-   private boolean orphaned(AssistantTurn turn)
-   {
-      Instant now = runtime.getClock().instant();
-      Instant heartbeat = turn.getHeartbeatAt() == null ? turn.getStartedAt() : turn.getHeartbeatAt();
-      return ((heartbeat != null && heartbeat.isBefore(now.minusSeconds(config.getTurnLeaseSeconds())))
-         || (turn.getStartedAt() != null && turn.getStartedAt().isBefore(now.minusSeconds(maxStreamSeconds())))
-         || ("CANCELLING".equals(turn.getStatus()) && turn.getCancelRequestedAt() != null
-         && turn.getCancelRequestedAt().isBefore(now.minusSeconds(config.getTurnLeaseSeconds()))));
-   }
-
-
-
-   /*******************************************************************************
-    ** Recover an abandoned run and leave a terminal replay for refreshes.
+    ** A turn whose replica died: it still says RUNNING / CANCELLING, no turn
+    ** of this runtime owns it, and it started longer ago than maxTurnSeconds
+    ** + 60 s (a live engine always ends itself by then). On first sight it is
+    ** finished as ERROR: the assistant message gets status ERROR and a
+    ** notice, and synthetic error (INTERNAL) + message.end events are
+    ** persisted, so replays end. Returns the (possibly updated) turn.
     *******************************************************************************/
    AssistantTurn reapIfOrphaned(AssistantTurn turn) throws QException
    {
-      synchronized(store)
+      if(!isRunning(turn) || runtime.getRunningTurn(turn.getId()) != null || turn.getStartedAt() == null)
       {
-         if(!isRunning(turn) || runtime.getRunningTurn(turn.getId()) != null || !orphaned(turn))
-         {
-            return (turn);
-         }
-         String reason = "CANCELLING".equals(turn.getStatus()) && turn.getCancelRequestedAt() != null
-            && turn.getCancelRequestedAt().isBefore(runtime.getClock().instant().minusSeconds(config.getTurnLeaseSeconds()))
-            ? (turn.getCancelReason() == null ? "USER" : turn.getCancelReason()) : null;
-         return (reap(turn, reason));
+         return (turn);
+      }
+      Instant stale = runtime.getClock().instant().minusSeconds(config.getMaxTurnSeconds() + 60L);
+      if(!turn.getStartedAt().isBefore(stale))
+      {
+         return (turn);
       }
-   }
 
+      String text = "This answer was interrupted (the server restarted). Ask again.";
+      if(turn.getAssistantMessageId() != null)
+      {
+         AssistantMessage message = store.getMessage(userId, turn.getAssistantMessageId());
+         if(message != null)
+         {
+            store.updateFields(AssistantMessage.TABLE_NAME, new QRecord()
+               .withValue("id", message.getId())
+               .withValue("status", "ERROR")
+               .withValue("partsJson", MessageParts.fromJson(message.getPartsJson()).addNotice("error", text).toJson()));
+         }
+      }
 
+      int seq = store.lastEventSeq(userId, turn.getId());
+      store.insertEvent(turn.getId(), userId, seq + 1, TurnEvent.ERROR, new TurnEvent(seq + 1, TurnEvent.ERROR, Map.of("code", "INTERNAL", "message", text)).toJson());
+      Map<String, Object> end = new java.util.LinkedHashMap<>();
+      if(turn.getAssistantMessageId() != null)
+      {
+         end.put("messageId", turn.getAssistantMessageId());
+      }
+      end.put("status", "ERROR");
+      end.put("stopReason", "interrupted");
+      store.insertEvent(turn.getId(), userId, seq + 2, TurnEvent.MESSAGE_END, new TurnEvent(seq + 2, TurnEvent.MESSAGE_END, end).toJson());
 
-   /*******************************************************************************
-    ** Re-read before recovery; never overwrite an already terminal row or
-    ** append another terminal event. Each persistence step is independent.
-    *******************************************************************************/
-   private AssistantTurn reap(AssistantTurn turn, String cancelReason) throws QException
-   {
-      AssistantTurn current = store.getTurn(userId, turn.getId());
-      if(!isRunning(current))
-      {
-         return (current);
-      }
-      if(!orphaned(current))
-      {
-         return (cancelReason == null ? current : requestStop(current, cancelReason));
-      }
-      // Recovery only appends fixed notices to already redacted stored parts (or
-      // crash placeholders). It never reloads model/tool values or raw user text.
-      String status = cancelReason == null ? "ERROR" : "CANCELLED";
-      String text = cancelReason == null ? "This answer was interrupted (the server restarted). Ask again."
-         : ("SUPERSEDED".equals(cancelReason) ? TurnEngine.SUPERSEDED_TEXT : "Stopped by you.");
-      if(current.getAssistantMessageId() != null)
-      {
-         try
-         {
-            AssistantMessage message = store.getMessage(userId, current.getAssistantMessageId());
-            if(message != null)
-            {
-               store.updateFields(AssistantMessage.TABLE_NAME, new QRecord().withValue("id", message.getId()).withValue("status", status)
-                  .withValue("partsJson", MessageParts.fromJson(message.getPartsJson()).addNotice(cancelReason == null ? "error" : "info", text).toJson()));
-            }
-         }
-         catch(Exception e)
-         {
-            LOG.warn("Could not persist recovered assistant message");
-         }
-      }
-      try
-      {
-         int seq = store.lastEventSeq(userId, current.getId());
-         List<AssistantTurnEvent> last = store.listEvents(userId, current.getId(), Math.max(0, seq - 1), 1);
-         if(last.isEmpty() || !TurnEvent.MESSAGE_END.equals(last.getFirst().getEventType()))
-         {
-            if(cancelReason == null)
-            {
-               seq++;
-               store.insertEvent(current.getId(), userId, seq, TurnEvent.ERROR,
-                  new TurnEvent(seq, TurnEvent.ERROR, Map.of("code", "INTERNAL", "message", text)).toJson());
-            }
-            seq++;
-            Map<String, Object> end = new LinkedHashMap<>();
-            end.put("messageId", current.getAssistantMessageId());
-            end.put("status", status);
-            end.put("stopReason", cancelReason == null ? "interrupted" : "cancelled");
-            store.insertEvent(current.getId(), userId, seq, TurnEvent.MESSAGE_END, new TurnEvent(seq, TurnEvent.MESSAGE_END, end).toJson());
-         }
-      }
-      catch(Exception e)
-      {
-         LOG.warn("Could not persist recovered assistant events");
-      }
       Instant now = runtime.getClock().instant();
-      store.updateRunningTurn(userId, new QRecord().withValue("id", current.getId()).withValue("status", status)
-         .withValue("errorCode", cancelReason == null ? "INTERNAL" : null).withValue("cancelReason", cancelReason)
-         .withValue("stopReason", cancelReason == null ? "interrupted" : "cancelled").withValue("phase", "done").withValue("endedAt", now));
-      return (store.getTurn(userId, current.getId()));
+      store.updateFields(AssistantTurn.TABLE_NAME, new QRecord()
+         .withValue("id", turn.getId())
+         .withValue("status", "ERROR")
+         .withValue("errorCode", "INTERNAL")
+         .withValue("stopReason", "interrupted")
+         .withValue("endedAt", now));
+      turn.setStatus("ERROR");
+      turn.setErrorCode("INTERNAL");
+      turn.setEndedAt(now);
+      return (turn);
    }
 
 
@@ -780,12 +577,6 @@ public class AssistantApi
          throw (new AssistantApiException(409, "This action is already " + action.getStatus().toLowerCase() + "."));
       }
 
-      AssistantTurn proposingTurn = store.getTurn(userId, action.getTurnId());
-      if(proposingTurn != null && isRunning(proposingTurn))
-      {
-         throw (new AssistantApiException(409, "Wait for the assistant to finish before confirming this action."));
-      }
-
       ///////////////////////////////////////////////////////////////////////
       // claim it first, so a double click cannot run the write twice     //
       ///////////////////////////////////////////////////////////////////////
@@ -807,7 +598,7 @@ public class AssistantApi
          throw (new QException("The stored values of action " + id + " are not valid JSON", e));
       }
       PolicyService.EffectivePolicy policy = runtime.getPolicyService().current(true);
-      UiApiToolbox.Context context = new UiApiToolbox.Context(session.getUuid(), session.getValue(QSession.VALUE_KEY_USER_TIMEZONE), runtime.getUiApiGateway(), policy.tools(), null, credentials, action.getTurnId() == null ? null : String.valueOf(action.getTurnId()));
+      UiApiToolbox.Context context = new UiApiToolbox.Context(session.getUuid(), session.getValue(QSession.VALUE_KEY_USER_TIMEZONE), runtime.getUiApiGateway(), policy.tools(), null);
       UiApiToolbox.Outcome outcome = BulkLoadTools.WRITE_TOOLS.contains(action.getToolName())
          ? runtime.getBulkLoadTools().executeConfirmed(context, action.getToolCallId(), action.getToolName(), action.getTableName(), values)
          : runtime.getToolbox().executeConfirmedWrite(context, action.getToolCallId(), action.getToolName(), action.getTableName(), action.getRecordId(), values);
@@ -822,7 +613,6 @@ public class AssistantApi
 
       store.insert(new AssistantToolCall()
          .withTurnId(action.getTurnId())
-         .withClientChannel("assistant" + (action.getTurnId() == null ? "" : "/" + action.getTurnId()))
          .withConversationId(action.getConversationId())
          .withUserId(userId)
          .withToolCallId(action.getToolCallId())
@@ -929,24 +719,10 @@ public class AssistantApi
     ** reason.
     *******************************************************************************/
    public Map<String, Object> access(String table, String prompt) throws QException, AssistantApiException
-   {
-      return (access(table, prompt, null));
-   }
-
-
-
-   /*******************************************************************************
-    ** A supplied turn must belong to this user before using it for attribution.
-    *******************************************************************************/
-   public Map<String, Object> access(String table, String prompt, Integer turnId) throws QException, AssistantApiException
    {
       requireAccess();
-      if(turnId != null)
-      {
-         requireTurn(turnId);
-      }
       List<Map<String, Object>> tables = new ArrayList<>();
-      for(AccessExplainer.TableAccess access : runtime.getAccessExplainer().explain(runtime.getUiApiGateway(), session.getUuid(), credentials, runtime.getPolicyService().current(false).tools(), table, prompt, turnId == null ? null : String.valueOf(turnId)))
+      for(AccessExplainer.TableAccess access : runtime.getAccessExplainer().explain(runtime.getUiApiGateway(), session.getUuid(), runtime.getPolicyService().current(false).tools(), table, prompt))
       {
          if(!access.uiVisible() && access.mode() == DataAccessMode.NONE)
          {
@@ -981,16 +757,6 @@ public class AssistantApi
 
 
 
-   /*******************************************************************************
-    ** Hard upper bound for remote stream polling and stale-run recovery.
-    *******************************************************************************/
-   public long maxStreamSeconds()
-   {
-      return (config.getMaxTurnSeconds() + (long) config.getTurnForceFinalizeGraceSeconds() + config.getTurnLeaseSeconds());
-   }
-
-
-
    /*******************************************************************************
     ** The user may use the panel: enabled, signed in, assistant.hasAccess.
     *******************************************************************************/

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/api/AssistantRouteProvider.java

@@ -17,27 +17,63 @@
 package com.kingsrook.qbits.assistant.api;
 
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
+import com.kingsrook.qbits.assistant.engine.RunningTurn;
+import com.kingsrook.qbits.assistant.engine.TurnEvent;
+import com.kingsrook.qbits.assistant.engine.TurnEventLog;
+import com.kingsrook.qqq.backend.core.context.QContext;
+import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
+import com.kingsrook.qqq.backend.core.model.session.QSession;
+import com.kingsrook.qqq.backend.core.utils.JsonUtils;
+import com.kingsrook.qqq.backend.core.utils.StringUtils;
 import com.kingsrook.qqq.middleware.javalin.QJavalinRouteProviderInterface;
+import com.kingsrook.qqq.middleware.javalin.QJavalinUtils;
+import com.kingsrook.qqq.middleware.javalin.executors.ExecutorSessionUtils;
 import io.javalin.config.JavalinConfig;
+import io.javalin.http.ContentType;
+import io.javalin.http.Context;
+import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
 /*******************************************************************************
- ** No routes any more: the assistant's endpoints are spec'd /qqq/v1
- ** operations ({@link com.kingsrook.qbits.assistant.api.specs.AssistantSpecs}).
- ** What is left is a before-handler that learns this server's local port from
- ** the first /qqq/v1 request, so the tools (and Explain access) can call the
- ** UI API on 127.0.0.1 before any assistant operation has run.
+ ** Javalin routes under /qqq/v1/assistant (contract section 3).
+ **
+ ** Every request gets the user's own session from the instance's
+ ** authentication module (ExecutorSessionUtils.setupSession: session cookie,
+ ** bearer token or API key) - never a system session. Bodies must be JSON
+ ** (a cross-site form cannot send that without a CORS preflight).
+ **
+ ** Streams (POST /conversations/{id}/turns, GET /turns/{id}/events) are
+ ** Server-Sent Events written to the response as they happen: "id: seq",
+ ** "event: type", "data: json", a blank line; a ping every 15 seconds;
+ ** Cache-Control no-cache and X-Accel-Buffering no (proxies must not
+ ** buffer; give the route a long idle timeout). The turn itself runs on its
+ ** own thread, so a client disconnect does not stop it; the client resumes
+ ** with /events?after=<last seq>.
+ **
+ ** Request and response bodies are never logged.
  *******************************************************************************/
 public class AssistantRouteProvider implements QJavalinRouteProviderInterface
 {
    private static final QLogger LOG = QLogger.getLogger(AssistantRouteProvider.class);
 
-   public static final String BASE_PATH = "/qqq/v1/assistant";
+   public static final String BASE_PATH       = "/qqq/v1/assistant";
+   public static final long   PING_MILLIS     = 15_000;
+   public static final long   REMOTE_POLL_MS  = 1_000;
 
    private QInstance qInstance;
+   private long      pingMillis = PING_MILLIS;
 
 
 
@@ -52,12 +88,28 @@ public class AssistantRouteProvider implements QJavalinRouteProviderInterface
 
 
 
+   /*******************************************************************************
+    ** Ping interval (tests use a short one).
+    *******************************************************************************/
+   public AssistantRouteProvider withPingMillis(long pingMillis)
+   {
+      this.pingMillis = pingMillis;
+      return (this);
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
    @Override
    public void acceptJavalinConfig(JavalinConfig config)
    {
+      ///////////////////////////////////////////////////////////////////////
+      // learn this server's local port from the first UI request (e.g.   //
+      // the metaData load), so tools and Explain access can loop back to //
+      // /qqq/v1 before any assistant route has been called               //
+      ///////////////////////////////////////////////////////////////////////
       config.routes.before("/qqq/v1/*", ctx ->
       {
          AssistantRuntime runtime = AssistantRuntime.of(qInstance);
@@ -73,6 +125,412 @@ public class AssistantRouteProvider implements QJavalinRouteProviderInterface
             }
          }
       });
+      config.routes.get(BASE_PATH + "/config", ctx -> json(ctx, false, (api, body) -> api.config()));
+      config.routes.get(BASE_PATH + "/conversations", ctx -> json(ctx, false, (api, body) -> api.listConversations(ctx.queryParam("status"))));
+      config.routes.post(BASE_PATH + "/conversations", ctx -> json(ctx, true, (api, body) ->
+      {
+         ctx.status(201);
+         return (api.createConversation(body));
+      }));
+      config.routes.get(BASE_PATH + "/conversations/{id}", ctx -> json(ctx, false, (api, body) -> api.getConversation(pathInt(ctx, "id"), queryInt(ctx, "before"), queryInt(ctx, "limit"))));
+      config.routes.patch(BASE_PATH + "/conversations/{id}", ctx -> json(ctx, true, (api, body) -> api.patchConversation(pathInt(ctx, "id"), body)));
+      config.routes.delete(BASE_PATH + "/conversations/{id}", ctx -> json(ctx, false, (api, body) ->
+      {
+         api.deleteConversation(pathInt(ctx, "id"));
+         ctx.status(204);
+         return (null);
+      }));
+      config.routes.post(BASE_PATH + "/conversations/{id}/turns", this::startTurn);
+      config.routes.get(BASE_PATH + "/turns/{turnId}/events", this::turnEvents);
+      config.routes.post(BASE_PATH + "/turns/{turnId}/cancel", ctx -> json(ctx, true, (api, body) ->
+      {
+         ctx.status(202);
+         return (api.cancelTurn(pathInt(ctx, "turnId")));
+      }));
+      config.routes.get(BASE_PATH + "/access", ctx -> json(ctx, false, (api, body) -> api.access(ctx.queryParam("table"), ctx.queryParam("prompt"))));
+      config.routes.get(BASE_PATH + "/actions/{id}", ctx -> json(ctx, false, (api, body) -> api.getAction(pathInt(ctx, "id"))));
+      config.routes.post(BASE_PATH + "/actions/{id}/confirm", ctx -> json(ctx, true, (api, body) -> api.confirmAction(pathInt(ctx, "id"))));
+      config.routes.post(BASE_PATH + "/actions/{id}/reject", ctx -> json(ctx, true, (api, body) -> api.rejectAction(pathInt(ctx, "id"))));
+      config.routes.post(BASE_PATH + "/messages/{id}/feedback", ctx -> json(ctx, true, (api, body) ->
+      {
+         api.feedback(pathInt(ctx, "id"), body);
+         ctx.status(204);
+         return (null);
+      }));
+   }
+
+
+
+   /*******************************************************************************
+    ** Session, runtime, body, handler, JSON - or the error.
+    *******************************************************************************/
+   private void json(Context context, boolean readsBody, Handler handler)
+   {
+      try
+      {
+         AssistantApi        api    = api(context);
+         Map<String, Object> body   = readsBody ? readJsonBody(context) : Map.of();
+         Object              result = handler.handle(api, body);
+         if(result != null)
+         {
+            context.contentType(ContentType.APPLICATION_JSON);
+            context.result(JsonUtils.toJsonCustomized(result, builder -> builder.serializationInclusion(JsonInclude.Include.ALWAYS)));
+         }
+      }
+      catch(Exception e)
+      {
+         handleException(context, e);
+      }
+      finally
+      {
+         QContext.clear();
+      }
+   }
+
+
+
+   /*******************************************************************************
+    ** POST /conversations/{id}/turns
+    *******************************************************************************/
+   private void startTurn(Context context)
+   {
+      RunningTurn turn;
+      try
+      {
+         AssistantApi api = api(context);
+         turn = api.startTurn(pathInt(context, "id"), readJsonBody(context));
+      }
+      catch(Exception e)
+      {
+         handleException(context, e);
+         QContext.clear();
+         return;
+      }
+      QContext.clear();
+      streamLive(context, turn.getLog(), 0);
+   }
+
+
+
+   /*******************************************************************************
+    ** GET /turns/{turnId}/events?after=
+    *******************************************************************************/
+   private void turnEvents(Context context)
+   {
+      Integer      turnId;
+      int          after;
+      AssistantApi api;
+      AssistantApi.TurnEvents events;
+      try
+      {
+         api = api(context);
+         turnId = pathInt(context, "turnId");
+         Integer afterParam = queryInt(context, "after");
+         after = afterParam == null ? 0 : Math.max(0, afterParam);
+         events = api.turnEvents(turnId, after);
+      }
+      catch(Exception e)
+      {
+         handleException(context, e);
+         QContext.clear();
+         return;
+      }
+
+      if(events.live() != null)
+      {
+         QContext.clear();
+         streamLive(context, events.live().getLog(), after);
+         return;
+      }
+
+      ///////////////////////////////////////////////////////////////////////
+      // persisted events; if the turn still runs on another replica, poll //
+      ///////////////////////////////////////////////////////////////////////
+      try
+      {
+         OutputStream out       = startStream(context);
+         int          last      = after;
+         long         lastWrite = System.currentTimeMillis();
+         long         giveUpAt  = System.currentTimeMillis() + (api.maxTurnSeconds() + 60L) * 1000L;
+         AssistantApi.TurnEvents current = events;
+         while(true)
+         {
+            boolean ended = false;
+            for(TurnEvent event : current.persisted())
+            {
+               write(out, event.toSseFrame());
+               last = event.getSeq();
+               lastWrite = System.currentTimeMillis();
+               ended |= event.isTerminal();
+            }
+            if(ended || (current.finished() && !current.more()) || System.currentTimeMillis() > giveUpAt)
+            {
+               return;
+            }
+            if(!current.more())
+            {
+               Thread.sleep(REMOTE_POLL_MS);
+            }
+            if(System.currentTimeMillis() - lastWrite >= pingMillis)
+            {
+               write(out, ping());
+               lastWrite = System.currentTimeMillis();
+            }
+            current = api.turnEvents(turnId, last);
+            if(current.live() != null)
+            {
+               QContext.clear();
+               writeLive(out, current.live().getLog(), last);
+               return;
+            }
+         }
+      }
+      catch(IOException e)
+      {
+         LOG.debug("Assistant event stream closed by the client", logPair("turnId", turnId));
+      }
+      catch(InterruptedException e)
+      {
+         Thread.currentThread().interrupt();
+      }
+      catch(Exception e)
+      {
+         LOG.warn("Assistant event replay failed", e, logPair("turnId", turnId));
+      }
+      finally
+      {
+         QContext.clear();
+      }
+   }
+
+
+
+   /*******************************************************************************
+    ** Stream a live log from a sequence number until message.end.
+    *******************************************************************************/
+   private void streamLive(Context context, TurnEventLog log, int after)
+   {
+      try
+      {
+         writeLive(startStream(context), log, after);
+      }
+      catch(IOException e)
+      {
+         LOG.debug("Assistant stream closed by the client (the turn continues)");
+      }
+      catch(InterruptedException e)
+      {
+         Thread.currentThread().interrupt();
+      }
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   private void writeLive(OutputStream out, TurnEventLog log, int after) throws IOException, InterruptedException
+   {
+      int last = after;
+      while(true)
+      {
+         List<TurnEvent> events = log.after(last, pingMillis);
+         if(events.isEmpty())
+         {
+            if(log.isClosed())
+            {
+               return;
+            }
+            write(out, ping());
+            continue;
+         }
+         for(TurnEvent event : events)
+         {
+            write(out, event.toSseFrame());
+            last = event.getSeq();
+            if(event.isTerminal())
+            {
+               return;
+            }
+         }
+      }
+   }
+
+
+
+   /*******************************************************************************
+    ** Start an SSE response.
+    *******************************************************************************/
+   private static OutputStream startStream(Context context) throws IOException
+   {
+      context.status(200);
+      context.disableCompression();
+      context.res().setContentType("text/event-stream; charset=utf-8");
+      context.res().setHeader("Cache-Control", "no-cache");
+      context.res().setHeader("X-Accel-Buffering", "no");
+      context.res().setHeader("Connection", "keep-alive");
+      OutputStream out = context.res().getOutputStream();
+      out.flush();
+      return (out);
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   private static void write(OutputStream out, String frame) throws IOException
+   {
+      out.write(frame.getBytes(StandardCharsets.UTF_8));
+      out.flush();
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   private static String ping()
+   {
+      return ("event: " + TurnEvent.PING + "\ndata: {}\n\n");
+   }
+
+
+
+   /*******************************************************************************
+    ** Session + API for a request. 404 when the QBit is not in the instance.
+    *******************************************************************************/
+   private AssistantApi api(Context context) throws Exception
+   {
+      AssistantRuntime runtime = AssistantRuntime.of(qInstance);
+      if(runtime == null)
+      {
+         throw (new AssistantApiException(404, "The assistant is not installed."));
+      }
+      ////////////////////////////////////////////////////////////////////
+      // the tools call /qqq/v1 on this server: remember its local port //
+      ////////////////////////////////////////////////////////////////////
+      try
+      {
+         runtime.learnLocalPort(context.req().getLocalPort());
+      }
+      catch(RuntimeException e)
+      {
+         LOG.debug("Could not read the local port", e);
+      }
+      QSession session = ExecutorSessionUtils.setupSession(context, qInstance);
+      return (new AssistantApi(runtime, session));
+   }
+
+
+
+   /*******************************************************************************
+    ** Map errors: API errors with their status, others through QQQ's handler
+    ** (401 / 403 / 404 / 500).
+    *******************************************************************************/
+   private static void handleException(Context context, Exception e)
+   {
+      if(e instanceof AssistantApiException apiException)
+      {
+         Map<String, Object> body = new LinkedHashMap<>();
+         body.put("error", apiException.getMessage());
+         if(apiException.getCode() != null)
+         {
+            body.put("code", apiException.getCode());
+         }
+         context.status(apiException.getStatus());
+         context.contentType(ContentType.APPLICATION_JSON);
+         context.result(JsonUtils.toJson(body));
+         return;
+      }
+      if(!(e instanceof QException))
+      {
+         LOG.warn("Assistant request failed", e);
+      }
+      QJavalinUtils.handleException(null, context, e);
+   }
+
+
+
+   /*******************************************************************************
+    ** A JSON object body (empty body = empty object).
+    *******************************************************************************/
+   static Map<String, Object> readJsonBody(Context context) throws AssistantApiException
+   {
+      String body = context.body();
+      if(!StringUtils.hasContent(body))
+      {
+         return (new LinkedHashMap<>());
+      }
+
+      String contentType = context.contentType();
+      if(contentType == null || !contentType.toLowerCase().startsWith("application/json"))
+      {
+         throw (new AssistantApiException(400, "Request bodies must be JSON (Content-Type: application/json)."));
+      }
+
+      try
+      {
+         Map<String, Object> map = JsonUtils.toObject(body, new TypeReference<Map<String, Object>>() {}, mapper -> mapper.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS));
+         return (map == null ? new LinkedHashMap<>() : map);
+      }
+      catch(Exception e)
+      {
+         throw (new AssistantApiException(400, "The request body is not a JSON object."));
+      }
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   private static Integer pathInt(Context context, String name) throws AssistantApiException
+   {
+      try
+      {
+         return (Integer.parseInt(context.pathParam(name)));
+      }
+      catch(NumberFormatException e)
+      {
+         throw (new AssistantApiException(400, name + " must be an integer."));
+      }
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   private static Integer queryInt(Context context, String name) throws AssistantApiException
+   {
+      String value = context.queryParam(name);
+      if(!StringUtils.hasContent(value))
+      {
+         return (null);
+      }
+      try
+      {
+         return (Integer.parseInt(value.trim()));
+      }
+      catch(NumberFormatException e)
+      {
+         throw (new AssistantApiException(400, name + " must be an integer."));
+      }
+   }
+
+
+
+   /*******************************************************************************
+    ** One JSON endpoint's work.
+    *******************************************************************************/
+   @FunctionalInterface
+   private interface Handler
+   {
+      /*******************************************************************************
+       **
+       *******************************************************************************/
+      Object handle(AssistantApi api, Map<String, Object> body) throws Exception;
    }
 
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/api/AssistantRoutes.java

@@ -17,12 +17,10 @@
 package com.kingsrook.qbits.assistant.api;
 
 
-import com.kingsrook.qbits.assistant.api.specs.AssistantSpecs;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 import com.kingsrook.qqq.middleware.javalin.QJavalinMetaData;
-import com.kingsrook.qqq.middleware.javalin.specs.extensions.MiddlewareSpecExtensionsMetaData;
 
 
 /*******************************************************************************
@@ -45,16 +43,6 @@ public class AssistantRoutes
       {
          javalinMetaData.withAdditionalRouteProviderReference(new QCodeReference(AssistantRouteProvider.class));
       }
-
-      ////////////////////////////////////////////////////////////////////
-      // the endpoints: the spec'd "assistant" UI API extension         //
-      ////////////////////////////////////////////////////////////////////
-      MiddlewareSpecExtensionsMetaData extensions = MiddlewareSpecExtensionsMetaData.ofOrWithNew(qInstance);
-      boolean hasExtension = extensions.getExtensions() != null && extensions.getExtensions().containsKey(AssistantSpecs.EXTENSION_NAME);
-      if(!hasExtension)
-      {
-         extensions.withExtension(AssistantSpecs.extension());
-      }
    }
 
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/api/TurnStreams.java

@@ -1,234 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.api;
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import com.kingsrook.qbits.assistant.engine.TurnEvent;
-import com.kingsrook.qbits.assistant.engine.TurnEventLog;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
-import io.javalin.http.Context;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
-
-
-/*******************************************************************************
- ** Writes a turn's events as server-sent events: the live log of a turn
- ** running here, or the persisted events (polling while the turn runs on
- ** another replica), with a ping every pingMillis while idle.
- *******************************************************************************/
-public final class TurnStreams
-{
-   private static final QLogger LOG = QLogger.getLogger(TurnStreams.class);
-
-   public static final long PING_MILLIS    = 15_000;
-   public static final long REMOTE_POLL_MS = 1_000;
-
-   private static volatile long pingMillis = PING_MILLIS;
-
-
-
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private TurnStreams()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** The ping interval (tests use a short one).
-    *******************************************************************************/
-   public static void setPingMillis(long millis)
-   {
-      pingMillis = millis;
-   }
-
-
-
-   /*******************************************************************************
-    ** Stream a live log from a sequence number until message.end.
-    *******************************************************************************/
-   public static void streamLive(Context context, TurnEventLog log, int after)
-   {
-      try
-      {
-         writeLive(startStream(context), log, after);
-      }
-      catch(IOException e)
-      {
-         LOG.debug("Assistant stream closed by the client (the turn continues)");
-      }
-      catch(InterruptedException e)
-      {
-         Thread.currentThread().interrupt();
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Stream the events of a turn after a sequence number: live when it runs
-    ** here, else the persisted ones (polling while it runs elsewhere). The
-    ** caller's QContext (session) must be set: the replay reads the store.
-    *******************************************************************************/
-   public static void streamEvents(Context context, AssistantApi api, Integer turnId, int after, AssistantApi.TurnEvents first)
-   {
-      if(first.live() != null)
-      {
-         streamLive(context, first.live().getLog(), after);
-         return;
-      }
-      try
-      {
-         OutputStream out       = startStream(context);
-         int          last      = after;
-         long         lastWrite = System.currentTimeMillis();
-         long         giveUpAt  = System.currentTimeMillis() + api.maxStreamSeconds() * 1000L;
-         AssistantApi.TurnEvents current = first;
-         while(true)
-         {
-            boolean ended = false;
-            for(TurnEvent event : current.persisted())
-            {
-               write(out, event.toSseFrame());
-               last = event.getSeq();
-               lastWrite = System.currentTimeMillis();
-               ended |= event.isTerminal();
-            }
-            if(ended || (current.finished() && !current.more()))
-            {
-               return;
-            }
-            if(System.currentTimeMillis() > giveUpAt)
-            {
-               write(out, new TurnEvent(last + 1, TurnEvent.ERROR, Map.of("code", "TIMEOUT", "message", "The event stream timed out. Reconnect to check this answer.")).toSseFrame());
-               write(out, new TurnEvent(last + 2, TurnEvent.MESSAGE_END, Map.of("status", "ERROR", "stopReason", "stream_timeout")).toSseFrame());
-               return;
-            }
-            if(!current.more())
-            {
-               Thread.sleep(REMOTE_POLL_MS);
-            }
-            if(System.currentTimeMillis() - lastWrite >= pingMillis)
-            {
-               write(out, ping());
-               lastWrite = System.currentTimeMillis();
-            }
-            current = api.turnEvents(turnId, last);
-            if(current.live() != null)
-            {
-               writeLive(out, current.live().getLog(), last);
-               return;
-            }
-         }
-      }
-      catch(IOException e)
-      {
-         LOG.debug("Assistant event stream closed by the client", logPair("turnId", turnId));
-      }
-      catch(InterruptedException e)
-      {
-         Thread.currentThread().interrupt();
-      }
-      catch(Exception e)
-      {
-         LOG.warn("Assistant event replay failed", e, logPair("turnId", turnId));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   static void writeLive(OutputStream out, TurnEventLog log, int after) throws IOException, InterruptedException
-   {
-      int last = after;
-      while(true)
-      {
-         List<TurnEvent> events = log.after(last, pingMillis);
-         if(events.isEmpty())
-         {
-            if(log.isClosed())
-            {
-               // The terminal event may have arrived after the empty poll.
-               if(log.size() <= last)
-               {
-                  return;
-               }
-               continue;
-            }
-            write(out, ping());
-            continue;
-         }
-         for(TurnEvent event : events)
-         {
-            write(out, event.toSseFrame());
-            last = event.getSeq();
-            if(event.isTerminal())
-            {
-               return;
-            }
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Start an SSE response.
-    *******************************************************************************/
-   private static OutputStream startStream(Context context) throws IOException
-   {
-      context.status(200);
-      context.disableCompression();
-      context.res().setContentType("text/event-stream; charset=utf-8");
-      context.res().setHeader("Cache-Control", "no-cache");
-      context.res().setHeader("X-Accel-Buffering", "no");
-      context.res().setHeader("Connection", "keep-alive");
-      OutputStream out = context.res().getOutputStream();
-      out.flush();
-      return (out);
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private static void write(OutputStream out, String frame) throws IOException
-   {
-      out.write(frame.getBytes(StandardCharsets.UTF_8));
-      out.flush();
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private static String ping()
-   {
-      return ("event: " + TurnEvent.PING + "\ndata: {}\n\n");
-   }
-
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/classification/ClassificationSource.java

@@ -22,12 +22,11 @@ package com.kingsrook.qbits.assistant.classification;
 
 
 import java.util.Collection;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
 import com.kingsrook.qqq.backend.core.context.QContext;
 
 
 /*******************************************************************************
- ** Host seam for table and field classifications; the default reads core metadata merged with configuration.
+ ** Host seam for table and field classifications; a core metadata adapter can replace the configured source.
  *******************************************************************************/
 public interface ClassificationSource
 {
@@ -64,7 +63,7 @@ public interface ClassificationSource
       DataClassification result = DataClassification.PUBLIC;
       for(String field : fields)
       {
-         result = Classifications.max(result, field == null || "*".equals(field) ? highest(table) : ofField(table, field));
+         result = DataClassification.max(result, field == null || "*".equals(field) ? highest(table) : ofField(table, field));
       }
       return (result);
    }
@@ -81,7 +80,7 @@ public interface ClassificationSource
       {
          if(!table.startsWith("assistant_"))
          {
-            result = Classifications.max(result, highest(table));
+            result = DataClassification.max(result, highest(table));
          }
       }
       return (result);

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/classification/ConfiguredClassificationSource.java

@@ -23,21 +23,12 @@ package com.kingsrook.qbits.assistant.classification;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import com.kingsrook.qqq.backend.core.actions.ai.AiDataClassifications;
-import com.kingsrook.qqq.backend.core.actions.ai.AiFieldMetaData;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
 import com.kingsrook.qqq.backend.core.context.QContext;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
 
 
 /*******************************************************************************
- ** The default classification source: core's AI classification metadata
- ** (AiTableMetaData / AiFieldMetaData, via AiDataClassifications) merged with
- ** the classifications configured on the qbit. A configured value wins when
- ** both are set; a field falls back to its own core classification, then to
- ** its table's; anything unclassified (and the assistant's own tables) is
- ** PUBLIC.
+ ** Default classification source for RCs without core classification metadata.
  *******************************************************************************/
 public class ConfiguredClassificationSource implements ClassificationSource
 {
@@ -80,7 +71,7 @@ public class ConfiguredClassificationSource implements ClassificationSource
    @Override
    public DataClassification ofTable(String table)
    {
-      return (table == null || table.startsWith("assistant_") ? DataClassification.PUBLIC : Classifications.max(null, tables.get(table) == null ? AiDataClassifications.ofTable(coreTable(table)) : tables.get(table)));
+      return (table == null || table.startsWith("assistant_") ? DataClassification.PUBLIC : DataClassification.max(null, tables.get(table)));
    }
 
 
@@ -96,28 +87,11 @@ public class ConfiguredClassificationSource implements ClassificationSource
          return (DataClassification.PUBLIC);
       }
       DataClassification value = field == null ? null : fields.getOrDefault(table, Map.of()).get(field);
-      if(value == null)
-      {
-         QTableMetaData metadata = coreTable(table);
-         AiFieldMetaData coreField = metadata == null || metadata.getFields() == null || field == null ? null : AiFieldMetaData.of(metadata.getFields().get(field));
-         value = coreField == null ? null : coreField.getClassification();
-      }
       return (value == null ? ofTable(table) : value);
    }
 
 
 
-   /*******************************************************************************
-    ** The table's core metadata, or null (no instance in context, or unknown).
-    *******************************************************************************/
-   private static QTableMetaData coreTable(String table)
-   {
-      QInstance qInstance = QContext.getQInstance();
-      return (qInstance == null ? null : qInstance.getTable(table));
-   }
-
-
-
    /*******************************************************************************
     ** Resolve all field names from the current instance, also retaining configured overrides.
     *******************************************************************************/
@@ -134,12 +108,12 @@ public class ConfiguredClassificationSource implements ClassificationSource
       {
          for(String field : metadata.getFields().keySet())
          {
-            result = Classifications.max(result, ofField(table, field));
+            result = DataClassification.max(result, ofField(table, field));
          }
       }
       for(DataClassification value : fields.getOrDefault(table, Map.of()).values())
       {
-         result = Classifications.max(result, value);
+         result = DataClassification.max(result, value);
       }
       return (result);
    }
@@ -155,11 +129,11 @@ public class ConfiguredClassificationSource implements ClassificationSource
       DataClassification result = ClassificationSource.super.highestAnywhere();
       for(String table : tables.keySet())
       {
-         result = Classifications.max(result, highest(table));
+         result = DataClassification.max(result, highest(table));
       }
       for(String table : fields.keySet())
       {
-         result = Classifications.max(result, highest(table));
+         result = DataClassification.max(result, highest(table));
       }
       return (result);
    }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/classification/DataClassification.java

@@ -1,11 +1,15 @@
 /*
- * Copyright 2026 Kingsrook, LLC
+ * QQQ - Low-code Application Framework for Engineers.
+ * Copyright (C) 2026.  Kingsrook, LLC
+ * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
+ * contact@kingsrook.com
+ * https://github.com/Kingsrook/
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,31 +21,24 @@
 package com.kingsrook.qbits.assistant.classification;
 
 
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
+
 
 
 /*******************************************************************************
- ** The assistant's conventions over core's {@link DataClassification}: an
- ** absent classification is PUBLIC, and a stored level this version does not
- ** know is treated as PHI (fail conservative).
+ ** Stand-in for core DataClassification (QRun-IO/qqq#1142); replace when the qbit builds on an RC that has it.
  *******************************************************************************/
-public final class Classifications
+public enum DataClassification
 {
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private Classifications()
-   {
-   }
+   PUBLIC, CONFIDENTIAL, PII, PHI;
 
 
 
    /*******************************************************************************
-    ** The level, or PUBLIC when absent.
+    ** Whether this classification is at least the supplied level; null means PUBLIC.
     *******************************************************************************/
-   public static DataClassification orPublic(DataClassification classification)
+   public boolean isAtLeast(DataClassification other)
    {
-      return (classification == null ? DataClassification.PUBLIC : classification);
+      return (ordinal() >= (other == null ? PUBLIC : other).ordinal());
    }
 
 
@@ -51,7 +48,9 @@ public final class Classifications
     *******************************************************************************/
    public static DataClassification max(DataClassification left, DataClassification right)
    {
-      return (DataClassification.max(orPublic(left), orPublic(right)));
+      DataClassification a = left == null ? PUBLIC : left;
+      DataClassification b = right == null ? PUBLIC : right;
+      return (a.isAtLeast(b) ? a : b);
    }
 
 
@@ -63,15 +62,15 @@ public final class Classifications
    {
       if(value == null)
       {
-         return (DataClassification.PUBLIC);
+         return (PUBLIC);
       }
       try
       {
-         return (DataClassification.valueOf(value));
+         return (valueOf(value));
       }
       catch(IllegalArgumentException e)
       {
-         return (DataClassification.PHI);
+         return (PHI);
       }
    }
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/email/AssistantEmail.java

@@ -1,111 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.email;
-
-
-import com.kingsrook.qbits.assistant.AssistantQBitConfig;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-
-
-/*******************************************************************************
- ** Email delivery of a scheduled task's result, when the optional qbit-email
- ** is present. This class names no qbit-email type, so it loads without the
- ** jar; the adapter (AssistantEmailSender) is only loaded after the guard passes.
- **
- ** Hosts can call sendScheduledResult after a run; the scheduled-task runner
- ** does not yet wire email delivery. The gates below apply to every call:
- ** the task opted in, the host approved EXTERNAL delivery
- ** (AssistantQBitConfig.getEmailExternalApproved, until the approval rule
- ** exists), and there is a recipient address.
- *******************************************************************************/
-public final class AssistantEmail
-{
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private AssistantEmail()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** Whether qbit-email is on the classpath and produced in this instance.
-    *******************************************************************************/
-   public static boolean isAvailable(QInstance qInstance)
-   {
-      try
-      {
-         Class.forName("com.kingsrook.qbits.email.api.EmailApi");
-      }
-      catch(ClassNotFoundException | LinkageError e)
-      {
-         return (false);
-      }
-      return (AssistantEmailSender.isInstalled(qInstance));
-   }
-
-
-
-   /*******************************************************************************
-    ** Email a finished scheduled run to its owner, if the task opted in and
-    ** every gate allows it. A missing email qbit is not an error; the status
-    ** says what happened.
-    *******************************************************************************/
-   public static ScheduledEmailStatus sendScheduledResult(QInstance qInstance, AssistantQBitConfig config, ScheduledResultNotice notice) throws QException
-   {
-      if(notice == null || !notice.emailResult())
-      {
-         return (ScheduledEmailStatus.NOT_REQUESTED);
-      }
-      if(!isAvailable(qInstance))
-      {
-         return (ScheduledEmailStatus.NOT_AVAILABLE);
-      }
-      if(!Boolean.TRUE.equals(config.getEmailExternalApproved()))
-      {
-         return (ScheduledEmailStatus.NOT_APPROVED);
-      }
-      String recipient = recipient(config, notice.ownerUserId());
-      if(recipient == null)
-      {
-         return (ScheduledEmailStatus.NO_RECIPIENT);
-      }
-      return (AssistantEmailSender.send(notice, recipient));
-   }
-
-
-
-   /*******************************************************************************
-    ** The owner's address: the host's resolver, else the owner id when it is
-    ** itself an address. Null when there is none.
-    *******************************************************************************/
-   static String recipient(AssistantQBitConfig config, String ownerUserId)
-   {
-      if(ownerUserId == null || ownerUserId.isBlank())
-      {
-         return (null);
-      }
-      String address = config.getEmailRecipientResolver() != null ? config.getEmailRecipientResolver().apply(ownerUserId) : (ownerUserId.contains("@") ? ownerUserId : null);
-      return (address == null || address.isBlank() ? null : address.trim());
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/email/AssistantEmailSender.java

@@ -1,156 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.email;
-
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import com.kingsrook.qbits.email.api.EmailApi;
-import com.kingsrook.qbits.email.api.EmailApiCategory;
-import com.kingsrook.qbits.email.api.EmailApiRequest;
-import com.kingsrook.qbits.email.api.EmailApiResult;
-import com.kingsrook.qbits.email.api.EmailApiTemplate;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-
-
-/*******************************************************************************
- ** The only class that touches qbit-email. Registers the scheduled-result
- ** template on first use (never overwriting edits) and queues one message per
- ** recipient. Addresses, summaries and bodies are never logged.
- *******************************************************************************/
-final class AssistantEmailSender
-{
-   static final String TEMPLATE_NAME   = "assistant_scheduled_result";
-   static final String SECURE_TEMPLATE = "email_secure_message";
-   static final String SENDER_QBIT     = "assistant";
-   static final String SENDER_PROCESS  = "assistantScheduledTask";
-
-   private static final int MAX_SUMMARY = 280;
-
-
-
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private AssistantEmailSender()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** Whether the email qbit is produced in this instance.
-    *******************************************************************************/
-   static boolean isInstalled(QInstance qInstance)
-   {
-      return (EmailApi.isInstalled(qInstance));
-   }
-
-
-
-   /*******************************************************************************
-    ** Queue one message to one recipient. A result classified above PUBLIC
-    ** sends only the link, with the secure-message pattern.
-    *******************************************************************************/
-   static ScheduledEmailStatus send(ScheduledResultNotice notice, String recipient) throws QException
-   {
-      boolean linkOnly = notice.classification() != null && notice.classification().isAtLeast(DataClassification.CONFIDENTIAL);
-
-      EmailApiRequest request = new EmailApiRequest().withTo(recipient)
-         .withIdempotencyKey("assistant:scheduled:" + notice.runId())
-         .withLinkedRecord(notice.runTable(), notice.runId())
-         .withSender(SENDER_QBIT, SENDER_PROCESS);
-
-      Map<String, Serializable> variables = new LinkedHashMap<>();
-      variables.put("link", notice.link());
-      if(linkOnly)
-      {
-         request.withTemplateName(SECURE_TEMPLATE);
-      }
-      else
-      {
-         ensureTemplate();
-         request.withTemplateName(TEMPLATE_NAME);
-         variables.put("taskName", notice.taskName());
-         variables.put("runTime", notice.runTime() == null ? null : notice.runTime().toString());
-         variables.put("summary", summary(notice.summary()));
-      }
-      request.withVariables(variables);
-
-      return (map(EmailApi.send(request)));
-   }
-
-
-
-   /*******************************************************************************
-    ** One line, cut short; the full model output never goes in an email.
-    *******************************************************************************/
-   static String summary(String value)
-   {
-      if(value == null)
-      {
-         return (null);
-      }
-      String oneLine = value.replaceAll("\\s+", " ").trim();
-      return (oneLine.length() <= MAX_SUMMARY ? oneLine : oneLine.substring(0, MAX_SUMMARY - 3) + "...");
-   }
-
-
-
-   /*******************************************************************************
-    ** Outbox result to the qbit's own vocabulary.
-    *******************************************************************************/
-   private static ScheduledEmailStatus map(EmailApiResult result)
-   {
-      return (switch(result.status())
-      {
-         case QUEUED -> ScheduledEmailStatus.QUEUED;
-         case DUPLICATE -> ScheduledEmailStatus.DUPLICATE;
-         case SUPPRESSED -> ScheduledEmailStatus.SUPPRESSED;
-         case REFUSED -> ScheduledEmailStatus.REFUSED;
-      });
-   }
-
-
-
-   /*******************************************************************************
-    ** Register the NOTIFICATION template once; an existing template is left alone.
-    *******************************************************************************/
-   static void ensureTemplate() throws QException
-   {
-      EmailApi.ensureTemplate(new EmailApiTemplate()
-         .withName(TEMPLATE_NAME)
-         .withLabel("Assistant scheduled task result")
-         .withCategory(EmailApiCategory.NOTIFICATION)
-         .withKind("MARKDOWN")
-         .withOwnerQbit(SENDER_QBIT)
-         .withSubject("Assistant task result: {{taskName}}")
-         .withBody("Your scheduled assistant task **{{taskName}}** finished at {{runTime}}.\n\n{{summary}}\n\n[Open the run]({{link}}){.button}")
-         .withVariable("taskName", "Task name", "STRING", true, "CONFIDENTIAL")
-         .withVariable("runTime", "Run time", "DATE_TIME", true, "PUBLIC")
-         .withVariable("summary", "Short summary", "STRING", false, "CONFIDENTIAL")
-         .withVariable("link", "Link to the run", "URL", true, "PUBLIC")
-         .withSampleVariables("{\"taskName\":\"Weekly review\",\"runTime\":\"2026-10-12T09:00:00Z\",\"summary\":\"Three items need attention.\",\"link\":\"https://app.example.com/app/assistant_run/1\"}"));
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/email/ScheduledEmailStatus.java

@@ -1,38 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.email;
-
-
-/*******************************************************************************
- ** Outcome of trying to email a scheduled task's result. The first four mean
- ** nothing was queued and why; the rest mirror the outbox result.
- *******************************************************************************/
-public enum ScheduledEmailStatus
-{
-   NOT_REQUESTED,
-   NOT_AVAILABLE,
-   NOT_APPROVED,
-   NO_RECIPIENT,
-   QUEUED,
-   DUPLICATE,
-   SUPPRESSED,
-   REFUSED
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/email/ScheduledResultNotice.java

@@ -1,46 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.email;
-
-
-import java.time.Instant;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
-
-
-/*******************************************************************************
- ** What the scheduled-task runner knows about one finished run, for the
- ** result email. The full model output is deliberately not part of it: only a
- ** short summary, and only when the result is classified PUBLIC.
- **
- ** @param runTable      the table holding the run record (the email's linked record)
- ** @param runId         the run's id (also the idempotency key)
- ** @param taskName      the scheduled task's name
- ** @param runTime       when the run finished
- ** @param summary       a short summary (cut to 280 characters; never the model output)
- ** @param classification the result's classification; null means PUBLIC
- ** @param ownerUserId   the task owner's user id (the way the qbit identifies users)
- ** @param emailResult   whether the task opted in to email delivery
- ** @param link          absolute link to the run record in the app
- *******************************************************************************/
-public record ScheduledResultNotice(String runTable, Object runId, String taskName, Instant runTime, String summary, DataClassification classification,
-                                    String ownerUserId, boolean emailResult, String link)
-{
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/ConnectionTest.java

@@ -21,19 +21,18 @@ import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
 import com.kingsrook.qbits.assistant.model.AssistantModel;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.HealthResult;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
 import com.kingsrook.qbits.assistant.provider.RegistryModelProvider;
+import com.kingsrook.qbits.assistant.provider.StreamHandle;
 import com.kingsrook.qbits.assistant.rag.EmbeddingService;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
-import com.kingsrook.qbits.assistant.spi.HealthResult;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelPricing;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qbits.assistant.spi.StreamHandle;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/ContextBuilder.java

@@ -28,16 +28,16 @@ import java.util.Set;
 import java.util.TreeMap;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
 import com.kingsrook.qbits.assistant.model.AssistantMessage;
-import com.kingsrook.qbits.assistant.spi.CacheHint;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelPart;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelToolDefinition;
-import com.kingsrook.qbits.assistant.spi.SystemBlock;
+import com.kingsrook.qbits.assistant.provider.CacheHint;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelPart;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
+import com.kingsrook.qbits.assistant.provider.SystemBlock;
 import com.kingsrook.qbits.assistant.tools.KnowledgeTool;
 import com.kingsrook.qbits.assistant.tools.PresentResultsTool;
-import com.kingsrook.qbits.assistant.tools.UiApiToolbox;
 import com.kingsrook.qbits.assistant.tools.bulkload.BulkLoadTools;
+import com.kingsrook.qbits.assistant.tools.UiApiToolbox;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolDefinition;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolKernel;
 import com.kingsrook.qqq.backend.core.context.QContext;
@@ -106,16 +106,6 @@ public class ContextBuilder
     ** kernel's navigate and search_help.
     *******************************************************************************/
    public List<ModelToolDefinition> tools(PolicyService.ToolPolicy policy)
-   {
-      return (tools(policy, null));
-   }
-
-
-
-   /*******************************************************************************
-    ** Attribute tool-discovery requests to the turn that needs them.
-    *******************************************************************************/
-   private List<ModelToolDefinition> tools(PolicyService.ToolPolicy policy, String turnId)
    {
       Map<String, ModelToolDefinition> byName = new TreeMap<>();
       for(ModelToolDefinition definition : toolbox.definitions(policy, toolbox.anyWritableTable()))
@@ -133,7 +123,7 @@ public class ContextBuilder
                .withStrict(isStrict(definition.getName(), !Boolean.FALSE.equals(definition.getStrict()))));
          }
       }
-      if(knowledgeTool != null && knowledgeTool.offered(policy, QContext.getQSession(), turnId))
+      if(knowledgeTool != null && knowledgeTool.offered(policy, QContext.getQSession()))
       {
          byName.put(KnowledgeTool.NAME, knowledgeTool.definition());
       }
@@ -226,23 +216,12 @@ public class ContextBuilder
     *******************************************************************************/
    public ModelRequest build(QSession session, String model, String effort, List<AssistantMessage> history, String userText, Map<String, Object> pageContext, PolicyService.ToolPolicy toolPolicy,
       String profileInstructions)
-   {
-      return (build(session, model, effort, history, userText, pageContext, toolPolicy, profileInstructions, null));
-   }
-
-
-
-   /*******************************************************************************
-    ** Include the turn in any UI API calls needed to discover available tools.
-    *******************************************************************************/
-   public ModelRequest build(QSession session, String model, String effort, List<AssistantMessage> history, String userText, Map<String, Object> pageContext, PolicyService.ToolPolicy toolPolicy,
-      String profileInstructions, String turnId)
    {
       ModelRequest request = new ModelRequest()
          .withModel(model)
          .withEffort(effort)
          .withMaxTokens(config.getModels().getMainMaxOutputTokens())
-         .withTools(tools(toolPolicy, turnId));
+         .withTools(tools(toolPolicy));
 
       request.getSystem().add(new SystemBlock(SystemPrompt.staticBlock(appDigest()), CacheHint.LONG));
       request.getSystem().add(new SystemBlock(userBlock(session) + (StringUtils.hasContent(profileInstructions) ? "\n" + profileInstructions : ""), CacheHint.SHORT));

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/FallbackChain.java

@@ -27,15 +27,15 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
 import com.kingsrook.qbits.assistant.model.AssistantModel;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
 import com.kingsrook.qbits.assistant.model.AssistantTurn;
-import com.kingsrook.qbits.assistant.spi.ModelEventListener;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
+import com.kingsrook.qbits.assistant.provider.ModelEventListener;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 
 

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/ModelDiscovery.java

@@ -24,11 +24,11 @@ import java.util.Set;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
 import com.kingsrook.qbits.assistant.model.AssistantModel;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
-import com.kingsrook.qbits.assistant.spi.DiscoveredModel;
-import com.kingsrook.qbits.assistant.spi.ModelCapabilities;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.DiscoveredModel;
+import com.kingsrook.qbits.assistant.provider.ModelCapabilities;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/ModelPricing.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.kingsrook.qbits.assistant.spi;
+package com.kingsrook.qbits.assistant.engine;
 
 
 import java.io.Serializable;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import com.kingsrook.qbits.assistant.AssistantModelRouting;
+import com.kingsrook.qbits.assistant.provider.ModelUsage;
 
 
 /*******************************************************************************
@@ -61,9 +63,9 @@ public class ModelPricing implements Serializable
    public static Map<String, ModelPricing> defaults()
    {
       Map<String, ModelPricing> map = new LinkedHashMap<>();
-      map.put("claude-sonnet-5-5", of(2.0, 10.0, 0.1));
-      map.put("claude-opus-5-5", of(4.0, 20.0, 0.05));
-      map.put("claude-haiku-5-5", of(0.10, 0.50, 0.1));
+      map.put(AssistantModelRouting.SONNET_5_5, of(2.0, 10.0, 0.1));
+      map.put(AssistantModelRouting.OPUS_5_5, of(4.0, 20.0, 0.05));
+      map.put(AssistantModelRouting.HAIKU_5_5, of(0.10, 0.50, 0.1));
       map.put("claude-fable-5-1", of(10.0, 50.0, 0.025));
       map.put("claude-fable-5", of(10.0, 50.0, 0.1));
       map.put("claude-opus-5", of(5.0, 25.0, 0.1));

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/ModelRouter.java

@@ -17,33 +17,32 @@
 package com.kingsrook.qbits.assistant.engine;
 
 
+import java.util.stream.Collectors;
+import java.util.Objects;
+import com.kingsrook.qbits.assistant.model.AssistantProvider;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Semaphore;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
 import com.kingsrook.qbits.assistant.model.AssistantConversation;
 import com.kingsrook.qbits.assistant.model.AssistantPendingAction;
 import com.kingsrook.qbits.assistant.model.AssistantProfile;
-import com.kingsrook.qbits.assistant.model.AssistantProvider;
 import com.kingsrook.qbits.assistant.model.AssistantTurn;
-import com.kingsrook.qbits.assistant.scheduled.ScheduledTurn;
-import com.kingsrook.qbits.assistant.spi.CacheHint;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qbits.assistant.spi.ModelUsage;
-import com.kingsrook.qbits.assistant.spi.StreamHandle;
-import com.kingsrook.qbits.assistant.spi.SystemBlock;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
+import com.kingsrook.qbits.assistant.provider.CacheHint;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
+import com.kingsrook.qbits.assistant.provider.ModelUsage;
+import com.kingsrook.qbits.assistant.provider.StreamHandle;
+import com.kingsrook.qbits.assistant.provider.SystemBlock;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterOrderBy;
@@ -117,9 +116,7 @@ public class ModelRouter
    public Route route(QSession session, AssistantConversation conversation, AssistantTurn turn, String question, Map<String, Object> pageContext,
       PolicyService.EffectivePolicy policy, TurnClassification classification, RunningTurn running, Instant deadline, Consumer<String> notice) throws QException, InterruptedException
    {
-      var scheduled = runtime.getScheduledTurn().task(conversation.getId());
-      ScheduledTurn.checkCost(scheduled, 0L);
-      AssistantProfile profile = runtime.getProfileService().pick(session, runtime.appNameFor(pageContext), scheduled == null ? null : scheduled.getProfileId());
+      AssistantProfile profile = runtime.getProfileService().pick(session, runtime.appNameFor(pageContext));
       String mode = profile == null || profile.getRoutingMode() == null ? "OFF" : profile.getRoutingMode();
       Boolean escalation = profile == null && Boolean.TRUE.equals(runtime.getConfig().getModels().getEscalationEnabled());
       String decision = "OFF";

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/PhiRoutingGuard.java

@@ -22,8 +22,8 @@ package com.kingsrook.qbits.assistant.engine;
 
 
 import java.util.Optional;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
 
 
 /*******************************************************************************

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/ProfileService.java

@@ -107,17 +107,7 @@ public class ProfileService
     *******************************************************************************/
    public Persona persona(QSession session, String appName)
    {
-      return (persona(session, appName, null));
-   }
-
-
-
-   /*******************************************************************************
-    ** An administrator-selected scheduled profile still respects role scope.
-    *******************************************************************************/
-   public Persona persona(QSession session, String appName, Integer profileId)
-   {
-      AssistantProfile profile = pick(session, appName, profileId);
+      AssistantProfile profile = pick(session, appName);
       if(profile == null)
       {
          return (new Persona(null, DEFAULT_DISPLAY_NAME, DEFAULT_ICON, null, null, List.of()));
@@ -227,22 +217,6 @@ public class ProfileService
     *******************************************************************************/
    public AssistantProfile pick(QSession session, String appName)
    {
-      return (pick(session, appName, null));
-   }
-
-
-
-   /*******************************************************************************
-    ** Explicit profiles supply instructions and routing, never permissions.
-    *******************************************************************************/
-   public AssistantProfile pick(QSession session, String appName, Integer profileId)
-   {
-      if(profileId != null)
-      {
-         return (load().profiles().stream().filter(p -> profileId.equals(p.getId()) && !Boolean.FALSE.equals(p.getEnabled())
-            && (!StringUtils.hasContent(p.getPermissionName()) || session.hasPermission(p.getPermissionName()))).findFirst().orElse(null));
-      }
-
       List<AssistantProfile> enabled = load().profiles().stream().filter(p -> !Boolean.FALSE.equals(p.getEnabled())).toList();
       return (enabled.stream()
          .filter(p -> appliesTo(p, session, appName))

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/ProviderHealth.java

@@ -23,9 +23,9 @@ import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qbits.assistant.spi.HealthResult;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.HealthResult;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/ProviderService.java

@@ -17,6 +17,18 @@
 package com.kingsrook.qbits.assistant.engine;
 
 
+import com.kingsrook.qbits.assistant.AssistantQBitConfig;
+import com.kingsrook.qbits.assistant.model.AssistantModel;
+import com.kingsrook.qbits.assistant.model.AssistantModelPrice;
+import com.kingsrook.qbits.assistant.model.AssistantProvider;
+import com.kingsrook.qbits.assistant.persistence.AssistantStore;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.ProviderSettings;
+import com.kingsrook.qbits.assistant.provider.RegistryModelProvider;
+import com.kingsrook.qqq.backend.core.exceptions.QException;
+import com.kingsrook.qqq.backend.core.logging.QLogger;
+import com.kingsrook.qqq.backend.core.utils.StringUtils;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
@@ -31,19 +43,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
-import com.kingsrook.qbits.assistant.AssistantQBitConfig;
-import com.kingsrook.qbits.assistant.model.AssistantModel;
-import com.kingsrook.qbits.assistant.model.AssistantModelPrice;
-import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qbits.assistant.persistence.AssistantStore;
-import com.kingsrook.qbits.assistant.provider.RegistryModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
-import com.kingsrook.qbits.assistant.spi.ModelPricing;
-import com.kingsrook.qbits.assistant.spi.ProviderSettings;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
-import com.kingsrook.qqq.backend.core.utils.StringUtils;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
@@ -259,11 +258,7 @@ public class ProviderService
          return (errors);
       }
 
-      errors.addAll(type.validate(new ProviderSettings().withKind(kind(row))
-         .withApiKeyEnvName(row.getApiKeyEnvName()).withBaseUrl(row.getBaseUrl())
-         .withApiVersion(row.getApiVersion()).withRegion(row.getRegion()).withCloudProject(row.getCloudProject())
-         .withTlsCaBundle(row.getTlsCaBundle()).withConnectTimeoutSeconds(row.getConnectTimeoutSeconds())
-         .withRequestTimeoutSeconds(row.getRequestTimeoutSeconds())));
+      errors.addAll(type.validate(row));
       String envName = keyEnvName(row);
       if(envName != null && !AssistantQBitConfig.ENV_NAME.matcher(envName).matches())
       {
@@ -683,7 +678,7 @@ public class ProviderService
       {
          throw (new ProviderSetupException("No API key: the environment variable " + keyEnvName(row) + " is not set on this server."));
       }
-      return (new ProviderSettings().withKind(kind(row)).withApiKeyEnvName(row.getApiKeyEnvName()).withApiKey(key)
+      return (new ProviderSettings().withKind(kind(row)).withApiKey(key)
          .withBaseUrl(StringUtils.hasContent(row.getBaseUrl()) ? row.getBaseUrl().trim() : null)
          .withApiVersion(row.getApiVersion()).withRegion(row.getRegion()).withCloudProject(row.getCloudProject())
          .withTlsCaBundle(row.getTlsCaBundle()).withSslContext(StringUtils.hasContent(row.getTlsCaBundle()) ? config.getTrustedCaBundles().get(row.getTlsCaBundle()) : null)
@@ -743,7 +738,7 @@ public class ProviderService
    /*******************************************************************************
     ** P-e seam: no automatic alternative is selected in P-c. Never downgrade PHI eligibility.
     *******************************************************************************/
-   public java.util.Optional<Active> eligibleAlternative(com.kingsrook.qqq.backend.core.actions.ai.DataClassification classification, AssistantProvider blockedProvider)
+   public java.util.Optional<Active> eligibleAlternative(com.kingsrook.qbits.assistant.classification.DataClassification classification, AssistantProvider blockedProvider)
    {
       return (java.util.Optional.empty());
    }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/RateLimiter.java

@@ -26,12 +26,15 @@ import java.util.Map;
 
 
 /*******************************************************************************
- ** Per-user starts per minute, in memory per replica. The API implements
- ** concurrency by superseding turns, never by refusing another question.
+ ** Per-user turn rate limits (spec 3.9): turns started per minute and turns
+ ** running at once. In memory, per replica - with several replicas the
+ ** effective limit is per replica (the concurrent limit is also checked
+ ** against the turn table by the API).
  *******************************************************************************/
 public class RateLimiter
 {
    private final Map<String, Deque<Instant>> starts  = new HashMap<>();
+   private final Map<String, Integer>        running = new HashMap<>();
    private final Clock                       clock;
 
 
@@ -58,12 +61,17 @@ public class RateLimiter
          queue.pollFirst();
       }
 
+      if(running.getOrDefault(userId, 0) >= concurrent)
+      {
+         return ("You already have an assistant answer in progress. Wait for it to finish or stop it.");
+      }
       if(queue.size() >= perMinute)
       {
          return ("Too many assistant requests in the last minute. Try again shortly.");
       }
 
       queue.addLast(now);
+      running.merge(userId, 1, Integer::sum);
       return (null);
    }
 
@@ -74,7 +82,7 @@ public class RateLimiter
     *******************************************************************************/
    public synchronized void release(String userId)
    {
-      // Only starts per minute are counted; completion does not refund a start.
+      running.computeIfPresent(userId, (k, v) -> v <= 1 ? null : v - 1);
    }
 
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/RunningTurn.java

@@ -17,11 +17,8 @@
 package com.kingsrook.qbits.assistant.engine;
 
 
-import java.time.Instant;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-import com.kingsrook.qbits.assistant.spi.StreamHandle;
+import com.kingsrook.qbits.assistant.provider.StreamHandle;
 
 
 /*******************************************************************************
@@ -33,14 +30,6 @@ public class RunningTurn
    private final String                        userId;
    private final TurnEventLog                  log          = new TurnEventLog();
    private final AtomicReference<String>       cancelReason = new AtomicReference<>();
-   private final AtomicBoolean finalized = new AtomicBoolean();
-   private Instant startedAt;
-   private volatile String phase = "starting";
-   private volatile String toolName;
-   private volatile Thread engineThread;
-   private volatile Consumer<String> forceFinalizer;
-   private volatile long cancelledNanos;
-   private volatile String trackingId;
    private volatile StreamHandle               currentHandle;
 
 
@@ -50,7 +39,6 @@ public class RunningTurn
     *******************************************************************************/
    public RunningTurn(Integer turnId, String userId)
    {
-      this.startedAt = Instant.now();
       this.turnId = turnId;
       this.userId = userId;
    }
@@ -62,24 +50,12 @@ public class RunningTurn
     *******************************************************************************/
    public void cancel(String reason)
    {
-      if(!finalized.get() && cancelReason.compareAndSet(null, reason))
+      if(cancelReason.compareAndSet(null, reason))
       {
-         cancelledNanos = System.nanoTime();
-         try
+         StreamHandle handle = currentHandle;
+         if(handle != null)
          {
-            StreamHandle handle = currentHandle;
-            if(handle != null)
-            {
-               handle.cancel();
-            }
-         }
-         finally
-         {
-            Thread thread = engineThread;
-            if(thread != null && thread != Thread.currentThread())
-            {
-               thread.interrupt();
-            }
+            handle.cancel();
          }
       }
    }
@@ -148,140 +124,4 @@ public class RunningTurn
       return (log);
    }
 
-
-
-
-   /*******************************************************************************
-    ** Claim terminal processing exactly once.
-    *******************************************************************************/
-   public boolean tryFinalize()
-   {
-      return (finalized.compareAndSet(false, true));
-   }
-
-
-
-   /*******************************************************************************
-    ** Whether terminal processing has been claimed.
-    *******************************************************************************/
-   public boolean isFinalized()
-   {
-      return (finalized.get());
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for startedAt
-    *******************************************************************************/
-   public Instant getStartedAt()
-   {
-      return (startedAt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for startedAt
-    *******************************************************************************/
-   public void setStartedAt(Instant startedAt)
-   {
-      this.startedAt = startedAt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for phase
-    *******************************************************************************/
-   public String getPhase()
-   {
-      return (phase);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for toolName
-    *******************************************************************************/
-   public String getToolName()
-   {
-      return (toolName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Record the current phase and optional tool.
-    *******************************************************************************/
-   public void setPhase(String phase, String toolName)
-   {
-      this.phase = phase;
-      this.toolName = toolName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Record the thread to interrupt when cancelling.
-    *******************************************************************************/
-   public void setEngineThread(Thread engineThread)
-   {
-      this.engineThread = engineThread;
-   }
-
-
-
-   /*******************************************************************************
-    ** Install the engine finalizer before registration.
-    *******************************************************************************/
-   public void setForceFinalizer(Consumer<String> forceFinalizer)
-   {
-      this.forceFinalizer = forceFinalizer;
-   }
-
-
-
-   /*******************************************************************************
-    ** Force terminal processing using the original user session.
-    *******************************************************************************/
-   public void forceFinalize(String reason)
-   {
-      Consumer<String> finalizer = forceFinalizer;
-      if(finalizer != null)
-      {
-         finalizer.accept(reason);
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Whether cancellation has exceeded its bounded grace period.
-    *******************************************************************************/
-   public boolean cancelGraceElapsed(int seconds)
-   {
-      return (isCancelled() && cancelledNanos != 0 && System.nanoTime() - cancelledNanos >= seconds * 1_000_000_000L);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for trackingId
-    *******************************************************************************/
-   public String getTrackingId()
-   {
-      return (trackingId);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for trackingId
-    *******************************************************************************/
-   public void setTrackingId(String trackingId)
-   {
-      this.trackingId = trackingId;
-   }
-
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/TurnClassification.java

@@ -27,12 +27,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import com.kingsrook.qbits.assistant.classification.ClassificationSource;
-import com.kingsrook.qbits.assistant.classification.Classifications;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
 import com.kingsrook.qbits.assistant.model.AssistantConversation;
-import com.kingsrook.qbits.assistant.spi.ModelPart;
+import com.kingsrook.qbits.assistant.provider.ModelPart;
 import com.kingsrook.qqq.backend.core.actions.ai.AiRecordRef;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolResult;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
 import com.kingsrook.qqq.backend.core.utils.JsonUtils;
@@ -56,7 +55,7 @@ public class TurnClassification
    public TurnClassification(ClassificationSource source, AssistantConversation conversation, Map<String, Object> pageContext)
    {
       this.source = source;
-      classification = Classifications.stored(conversation.getMaxClassification());
+      classification = DataClassification.stored(conversation.getMaxClassification());
       if(pageContext != null && pageContext.get("tableName") instanceof String table)
       {
          touch(table, pageContext.get("recordId") == null ? source.ofTable(table) : source.highest(table));
@@ -211,7 +210,7 @@ public class TurnClassification
     *******************************************************************************/
    private void touchUnknown()
    {
-      classification = Classifications.max(classification, source.highestAnywhere());
+      classification = DataClassification.max(classification, source.highestAnywhere());
       for(String table : QContext.getQInstance().getTables().keySet())
       {
          if(!table.startsWith("assistant_") && source.highest(table) != DataClassification.PUBLIC)
@@ -230,7 +229,7 @@ public class TurnClassification
    {
       if(table != null && !table.startsWith("assistant_"))
       {
-         classification = Classifications.max(classification, value);
+         classification = DataClassification.max(classification, value);
          if(QContext.getQInstance().getTable(table) != null)
          {
             tables.add(table);
@@ -257,7 +256,7 @@ public class TurnClassification
    {
       if(conversation != null)
       {
-         classification = Classifications.max(classification, Classifications.stored(conversation.getMaxClassification()));
+         classification = DataClassification.max(classification, DataClassification.stored(conversation.getMaxClassification()));
       }
    }
 

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/TurnDataRouting.java

@@ -22,10 +22,10 @@ package com.kingsrook.qbits.assistant.engine;
 
 
 import com.kingsrook.qbits.assistant.AssistantRuntime;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
 import com.kingsrook.qbits.assistant.model.AssistantDataAudit;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
 import com.kingsrook.qbits.assistant.model.AssistantTurn;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 
 

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/TurnEngine.java

@@ -27,41 +27,34 @@ import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
 import com.kingsrook.qbits.assistant.model.AssistantConversation;
 import com.kingsrook.qbits.assistant.model.AssistantMessage;
 import com.kingsrook.qbits.assistant.model.AssistantPendingAction;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledTask;
 import com.kingsrook.qbits.assistant.model.AssistantToolCall;
 import com.kingsrook.qbits.assistant.model.AssistantTurn;
 import com.kingsrook.qbits.assistant.persistence.AssistantStore;
-import com.kingsrook.qbits.assistant.persistence.TranscriptRedactor;
-import com.kingsrook.qbits.assistant.scheduled.ScheduledTurn;
-import com.kingsrook.qbits.assistant.spi.AssistantModelProvider;
-import com.kingsrook.qbits.assistant.spi.CacheHint;
-import com.kingsrook.qbits.assistant.spi.ModelCapabilities;
-import com.kingsrook.qbits.assistant.spi.ModelEventListener;
-import com.kingsrook.qbits.assistant.spi.ModelMessage;
-import com.kingsrook.qbits.assistant.spi.ModelPart;
-import com.kingsrook.qbits.assistant.spi.ModelPricing;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelRequest;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qbits.assistant.spi.ModelUsage;
-import com.kingsrook.qbits.assistant.spi.StreamHandle;
+import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
+import com.kingsrook.qbits.assistant.provider.CacheHint;
+import com.kingsrook.qbits.assistant.provider.ModelCapabilities;
+import com.kingsrook.qbits.assistant.provider.ModelEventListener;
+import com.kingsrook.qbits.assistant.provider.ModelMessage;
+import com.kingsrook.qbits.assistant.provider.ModelPart;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelRequest;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
+import com.kingsrook.qbits.assistant.provider.ModelUsage;
+import com.kingsrook.qbits.assistant.provider.StreamHandle;
 import com.kingsrook.qbits.assistant.tools.KnowledgeTool;
 import com.kingsrook.qbits.assistant.tools.PresentResultsTool;
-import com.kingsrook.qbits.assistant.tools.UiApiToolbox;
 import com.kingsrook.qbits.assistant.tools.bulkload.BulkLoadTools;
+import com.kingsrook.qbits.assistant.tools.UiApiToolbox;
 import com.kingsrook.qqq.backend.core.actions.ai.AiRecordRef;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolCall;
 import com.kingsrook.qqq.backend.core.actions.ai.AiToolOutcome;
@@ -74,7 +67,6 @@ import com.kingsrook.qqq.backend.core.model.data.QRecord;
 import com.kingsrook.qqq.backend.core.model.session.QSession;
 import com.kingsrook.qqq.backend.core.utils.JsonUtils;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
-import com.kingsrook.qqq.middleware.javalin.specs.invoke.UiApiCredentials;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
@@ -103,11 +95,10 @@ public class TurnEngine implements Runnable
 {
    private static final QLogger LOG = QLogger.getLogger(TurnEngine.class);
 
-   public static final String SUPERSEDED_TEXT = "Stopped because you asked something else.";
-   public static final String TIMEOUT_TEXT = "The assistant took too long to answer, so it was stopped. Ask again.";
-   public static final String RESTART_TEXT = "The server restarted while answering. Ask again.";
+   private static final int MAX_INPUT_JSON_CHARS  = 4000;
 
    private static final AiRedactor INPUT_REDACTOR = new AiRedactor(List.of());
+   private static final int MAX_RESULT_JSON_CHARS = 64_000;
    private static final int TEXT_FLUSH_CHARS      = 48;
    private static final long TEXT_FLUSH_MILLIS    = 120;
 
@@ -136,9 +127,6 @@ public class TurnEngine implements Runnable
    private final StringBuilder              textBuffer    = new StringBuilder();
    private long                             lastTextFlush = System.currentTimeMillis();
 
-   private AssistantScheduledTask scheduledTask;
-   private PolicyService.ToolPolicy toolPolicy;
-
    private Instant startedAt;
    private Instant deadline;
    private int     toolCallCount  = 0;
@@ -152,9 +140,6 @@ public class TurnEngine implements Runnable
    private ProviderService.Active budgetOrigin;
 
    private volatile boolean finished = false;
-   private UiApiCredentials credentials;
-   private volatile TranscriptRedactor transcript;
-   private boolean engineRunning;
 
 
 
@@ -179,49 +164,6 @@ public class TurnEngine implements Runnable
       this.policy = policy;
       this.running = running;
       this.softBudgetNotice = softBudgetNotice;
-      this.startedAt = turn.getStartedAt() == null ? runtime.getClock().instant() : turn.getStartedAt();
-      this.deadline = startedAt.plusSeconds(config.getMaxTurnSeconds());
-      running.setStartedAt(startedAt);
-      running.setForceFinalizer(this::forceFinish);
-   }
-
-
-
-   /*******************************************************************************
-    ** The credentials of the request that started the turn, forwarded to the
-    ** UI API by the tools (session cookies, Authorization, API key as they came
-    ** in). Without them the session UUID is used. Never logged.
-    *******************************************************************************/
-   public TurnEngine withCredentials(UiApiCredentials credentials)
-   {
-      this.credentials = credentials;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Continue the API's provisional transcript scope on the engine thread.
-    *******************************************************************************/
-   public TurnEngine withTranscript(TranscriptRedactor transcript)
-   {
-      this.transcript = transcript;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Finalization may run before submission or on a watchdog/shutdown thread.
-    ** Bind the same turn scope before any of those paths writes transcript content.
-    *******************************************************************************/
-   private synchronized void attachTranscript()
-   {
-      if(transcript == null)
-      {
-         transcript = new TranscriptRedactor(runtime.getQInstance(), config.getClassificationSource());
-      }
-      transcript.attach();
    }
 
 
@@ -232,11 +174,8 @@ public class TurnEngine implements Runnable
    @Override
    public void run()
    {
-      if(running.isFinalized())
-      {
-         return;
-      }
-      running.setEngineThread(Thread.currentThread());
+      startedAt = runtime.getClock().instant();
+      deadline = startedAt.plusSeconds(config.getMaxTurnSeconds());
 
       String status     = "COMPLETE";
       String stopReason = null;
@@ -246,28 +185,11 @@ public class TurnEngine implements Runnable
       try
       {
          QContext.init(runtime.getQInstance(), session);
-         synchronized(this)
-         {
-            if(running.isFinalized())
-            {
-               return;
-            }
-            engineRunning = true;
-            attachTranscript();
-         }
-         startWatchdog();
-         scheduledTask = runtime.getScheduledTurn().task(conversation.getId());
-         if(conversation.getScheduledTaskId() != null && scheduledTask == null)
-         {
-            throw (new QException("Scheduled execution context is no longer available; start a new conversation."));
-         }
-         toolPolicy = scheduledTask == null ? policy.tools() : ScheduledTurn.tools(runtime, scheduledTask, policy.tools());
-         ScheduledTurn.checkCost(runtime, conversation.getId(), turn.getId());
          classification = new TurnClassification(config.getClassificationSource(), conversation, pageContext);
          store.saveClassification(userId, conversation.getId(), turn.getId(), classification);
+         startKillSwitchWatcher();
 
-
-         emit(TurnEvent.MESSAGE_START, map("turnId", turn.getId(), "conversationId", conversation.getId(), "userMessageId", userMessage.getId(), "messageId", assistantMessage.getId(), "startedAt", startedAt.toString()));
+         emit(TurnEvent.MESSAGE_START, map("turnId", turn.getId(), "conversationId", conversation.getId(), "userMessageId", userMessage.getId(), "messageId", assistantMessage.getId()));
          if(softBudgetNotice != null)
          {
             notice("warning", softBudgetNotice);
@@ -279,7 +201,6 @@ public class TurnEngine implements Runnable
          ModelRouter.Route route;
          try
          {
-            phase("thinking", null);
             route = router.route(session, conversation, turn, userText, pageContext, policy, classification, running, deadline, text -> notice("warning", text));
          }
          finally
@@ -309,9 +230,9 @@ public class TurnEngine implements Runnable
          }
 
          String                  appName = runtime.appNameFor(pageContext);
-         ProfileService.Persona  persona = runtime.getProfileService().persona(session, appName, scheduledTask == null ? null : scheduledTask.getProfileId());
+         ProfileService.Persona  persona = runtime.getProfileService().persona(session, appName);
          String                  profileText = ProfileService.instructions(persona, runtime.getProfileService().relevantSkills(persona.profileId(), userText, appName));
-         ModelRequest request = runtime.getContextBuilder().build(session, model, route.effort(), history, userText, pageContext, toolPolicy, profileText, turn.getId() == null ? null : String.valueOf(turn.getId()));
+         ModelRequest request = runtime.getContextBuilder().build(session, model, route.effort(), history, userText, pageContext, policy.tools(), profileText);
          Integer maxPerRequest = active.row() == null ? null : active.row().getMaxOutputTokensPerRequest();
          if(maxPerRequest != null && (request.getMaxTokens() == null || request.getMaxTokens() > maxPerRequest))
          {
@@ -321,7 +242,7 @@ public class TurnEngine implements Runnable
          {
             request.setParallelToolCalls(false);
          }
-         Set<String> allowedTools = runtime.getContextBuilder().toolNames(toolPolicy);
+         Set<String> allowedTools = runtime.getContextBuilder().toolNames(policy.tools());
 
          boolean toolLimitReached = false;
          while(true)
@@ -338,7 +259,6 @@ public class TurnEngine implements Runnable
 
             ModelResponse response = fallback.call(request, () -> active, selected -> callModelWithStrictFallback(selected, request));
             stopReason = response.getStopReason();
-            ScheduledTurn.checkCost(runtime, conversation.getId(), turn.getId());
 
             if(ModelResponse.STOP_CANCELLED.equals(stopReason))
             {
@@ -468,88 +388,44 @@ public class TurnEngine implements Runnable
       }
       finally
       {
-         // Clear interruption while persisting the terminal state.
-         boolean interrupted = Thread.interrupted();
-         if(running.isCancelled())
-         {
-            Stop stop = cancelledStop();
-            status = stop.status();
-            stopReason = stop.stopReason();
-            errorCode = stop.errorCode();
-            errorText = stop.message();
-         }
-         try
-         {
-            finish(status, stopReason, errorCode, errorText);
-         }
-         finally
-         {
-            if(transcript != null)
-            {
-               transcript.close();
-            }
-            if(interrupted)
-            {
-               Thread.currentThread().interrupt();
-            }
-            QContext.clear();
-         }
+         finished = true;
+         finish(status, stopReason, errorCode, errorText);
+         QContext.clear();
       }
    }
 
 
 
    /*******************************************************************************
-    ** Renew the lease, poll cancellation and the kill switch with the user's
-    ** own session, and enforce a hard deadline even if a provider is wedged.
+    ** Poll the kill switch while the turn runs (with the user's own session),
+    ** so a flip cancels the turn - and every other turn here - even while it
+    ** waits on the model.
     *******************************************************************************/
-   private void startWatchdog()
+   private void startKillSwitchWatcher()
    {
-      long heartbeatMillis = config.getTurnHeartbeatSeconds() * 1000L;
-      long pollMillis = Math.min(heartbeatMillis, config.getKillSwitchPollMillis() == null ? 2000 : config.getKillSwitchPollMillis());
-      Thread.ofVirtual().name("assistant-watchdog-" + turn.getId()).start(() ->
+      long pollMillis = config.getKillSwitchPollMillis() == null ? 2000 : config.getKillSwitchPollMillis();
+      Thread.ofVirtual().name("assistant-killswitch-" + turn.getId()).start(() ->
       {
-         long lastHeartbeat = System.nanoTime();
          try
          {
-            QContext.init(runtime.getQInstance(), session);
-            while(!running.isFinalized())
+            while(!finished && !running.isCancelled())
             {
                Thread.sleep(pollMillis);
-               if(running.isFinalized())
+               if(finished)
                {
-                  break;
+                  return;
                }
+               QContext.init(runtime.getQInstance(), session);
                try
                {
-                  if(System.nanoTime() - lastHeartbeat >= heartbeatMillis * 1_000_000L)
-                  {
-                     lastHeartbeat = System.nanoTime();
-                     heartbeat();
-                  }
                   if(runtime.getPolicyService().isKillSwitchOn())
                   {
                      runtime.cancelAll("KILL_SWITCH");
                   }
                }
-               catch(Exception e)
-               {
-                  LOG.warn("Assistant watchdog tick failed", hipaaSafe(e), logPair("turnId", turn.getId()));
-               }
                finally
                {
-                  // Deadlines do not depend on successful database or policy reads.
-                  Instant now = runtime.getClock().instant();
-                  if(!now.isBefore(deadline))
-                  {
-                     safely(() -> running.cancel("TIMEOUT"));
-                  }
-                  if(!now.isBefore(deadline.plusSeconds(config.getTurnForceFinalizeGraceSeconds()))
-                     || running.cancelGraceElapsed(config.getTurnForceFinalizeGraceSeconds()))
-                  {
-                     Stop stop = running.isCancelled() ? cancelledStop() : new Stop("ERROR", "TIMEOUT", TIMEOUT_TEXT, "timeout");
-                     finish(stop.status(), stop.stopReason(), stop.errorCode(), stop.message());
-                  }
+                  QContext.clear();
                }
             }
          }
@@ -557,63 +433,11 @@ public class TurnEngine implements Runnable
          {
             Thread.currentThread().interrupt();
          }
-         finally
-         {
-            QContext.clear();
-         }
       });
    }
 
 
 
-   /*******************************************************************************
-    ** Renew only an active row, then observe persisted cancellation requests.
-    *******************************************************************************/
-   private synchronized void heartbeat() throws QException
-   {
-      if(running.isFinalized())
-      {
-         return;
-      }
-      AssistantTurn row = store.getTurn(userId, turn.getId());
-      if(row == null || !("RUNNING".equals(row.getStatus()) || "CANCELLING".equals(row.getStatus())))
-      {
-         safely(() -> running.cancel("USER"));
-         finish(row == null ? "ERROR" : row.getStatus(), row == null ? "interrupted" : row.getStopReason(),
-            row == null ? "INTERNAL" : row.getErrorCode(), null);
-         return;
-      }
-      store.updateFields(AssistantTurn.TABLE_NAME, new QRecord().withValue("id", turn.getId())
-         .withValue("heartbeatAt", runtime.getClock().instant()).withValue("phase", running.getPhase()));
-      row = store.getTurn(userId, turn.getId());
-      if(row != null && (row.getCancelRequestedAt() != null || "CANCELLING".equals(row.getStatus())))
-      {
-         running.cancel(row.getCancelReason() == null ? "USER" : row.getCancelReason());
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Finalize from shutdown using the original authenticated user's context.
-    *******************************************************************************/
-   private void forceFinish(String reason)
-   {
-      try
-      {
-         QContext.init(runtime.getQInstance(), session);
-         safely(() -> running.cancel(reason));
-         Stop stop = "SHUTDOWN".equals(reason) ? new Stop("ERROR", "INTERRUPTED", RESTART_TEXT, "interrupted") : cancelledStop();
-         finish(stop.status(), stop.stopReason(), stop.errorCode(), stop.message());
-      }
-      finally
-      {
-         QContext.clear();
-      }
-   }
-
-
-
    /*******************************************************************************
     ** Why a turn stops.
     *******************************************************************************/
@@ -648,15 +472,14 @@ public class TurnEngine implements Runnable
       }
       if(!runtime.getClock().instant().isBefore(deadline))
       {
-         running.cancel("TIMEOUT");
-         return (cancelledStop());
+         return (new Stop("ERROR", "TIMEOUT", "The assistant ran out of time for this question.", "timeout"));
       }
       try
       {
          AssistantTurn row = store.getTurn(userId, turn.getId());
          if(row != null && "CANCELLING".equals(row.getStatus()))
          {
-            running.cancel(row.getCancelReason() == null ? "USER" : row.getCancelReason());
+            running.cancel("USER");
             return (cancelledStop());
          }
       }
@@ -674,18 +497,6 @@ public class TurnEngine implements Runnable
     *******************************************************************************/
    private Stop cancelledStop()
    {
-      if("TIMEOUT".equals(running.getCancelReason()))
-      {
-         return (new Stop("ERROR", "TIMEOUT", TIMEOUT_TEXT, "timeout"));
-      }
-      if("SHUTDOWN".equals(running.getCancelReason()))
-      {
-         return (new Stop("ERROR", "INTERRUPTED", RESTART_TEXT, "interrupted"));
-      }
-      if("SUPERSEDED".equals(running.getCancelReason()))
-      {
-         return (new Stop("CANCELLED", null, SUPERSEDED_TEXT, ModelResponse.STOP_CANCELLED));
-      }
       if("KILL_SWITCH".equals(running.getCancelReason()))
       {
          String reason = StringUtils.hasContent(policy.killSwitchReason()) ? " " + policy.killSwitchReason() : "";
@@ -732,7 +543,6 @@ public class TurnEngine implements Runnable
       {
          return (new ModelResponse().withStopReason(ModelResponse.STOP_CANCELLED));
       }
-      ScheduledTurn.checkCost(runtime, conversation.getId(), turn.getId());
       PolicyService.BudgetStatus configuredBudget = runtime.getPolicyService().checkConfiguredBudget(policy, userId, usage.billableTokens(), costMicros);
       if(configuredBudget.hardExceeded())
       {
@@ -746,7 +556,7 @@ public class TurnEngine implements Runnable
          throw (new BudgetService.Blocked(budgetDecision.reason()));
       }
       ProviderService.Active selected = budgetDecision.active();
-      if(!Objects.equals(active.providerId(), selected.providerId()) || !Objects.equals(active.model(), selected.model()))
+      if(!java.util.Objects.equals(active.providerId(), selected.providerId()) || !java.util.Objects.equals(active.model(), selected.model()))
       {
          active = selected;
          model = active.model();
@@ -775,7 +585,6 @@ public class TurnEngine implements Runnable
          @Override
          public void onTextDelta(String text)
          {
-            phase("writing", null);
             bufferText(text);
          }
       };
@@ -797,7 +606,6 @@ public class TurnEngine implements Runnable
          TurnDataRouting.beforeModelCall(runtime, classification, turn, active);
          fallback.beforeCall(active);
          modelCallCount++;
-         phase("thinking", null);
          StreamHandle handle = provider.stream(request.copy(), fallback.listener(listener));
          running.setCurrentHandle(handle);
          try
@@ -860,14 +668,12 @@ public class TurnEngine implements Runnable
       for(int i = 0; i < toolUses.size(); i++)
       {
          ModelPart use = toolUses.get(i);
-         transcript.input(use.getInput());
          if(i >= allowed)
          {
             limitReached = true;
             continue;
          }
          toolCallCount++;
-         phase("tool", use.getToolName());
          emit(TurnEvent.TOOL_START, map("messageId", assistantMessage.getId(), "toolCallId", use.getToolUseId(), "name", use.getToolName(), "summary", ToolLabels.running(use.getToolName())));
 
          if(!allowedTools.contains(use.getToolName()))
@@ -881,14 +687,8 @@ public class TurnEngine implements Runnable
          AiToolCall   call  = new AiToolCall().withId(use.getToolUseId()).withName(use.getToolName()).withInput(use.getInput());
          futures.add(runtime.getExecutor().submit(() ->
          {
-            if(!transcript.retainWorker())
-            {
-               return;
-            }
-            transcript.attach();
             try
             {
-               QContext.init(runtime.getQInstance(), session);
                permits.acquire();
                try
                {
@@ -950,12 +750,6 @@ public class TurnEngine implements Runnable
                results[index] = new AiToolResult().withToolCallId(call.getId()).withToolName(call.getName()).withOutcome(AiToolOutcome.ERROR)
                   .withSummary("Failed").withModelContent("The tool failed unexpectedly.");
             }
-            finally
-            {
-               transcript.releaseWorker();
-               TranscriptRedactor.detach();
-               QContext.clear();
-            }
          }));
       }
       persistPendingEvents();
@@ -967,11 +761,11 @@ public class TurnEngine implements Runnable
          {
             future.get(waitMillis, TimeUnit.MILLISECONDS);
          }
-         catch(TimeoutException e)
+         catch(java.util.concurrent.TimeoutException e)
          {
             future.cancel(true);
          }
-         catch(ExecutionException e)
+         catch(java.util.concurrent.ExecutionException e)
          {
             LOG.debug("tool future failed", hipaaSafe(e));
          }
@@ -1053,15 +847,13 @@ public class TurnEngine implements Runnable
 
       try
       {
-         String inputJson = redactInput(PresentResultsTool.NAME.equals(use.getToolName()) ? (presentation ? result.getRender() : Map.of()) : use.getInput());
          store.insert(new AssistantToolCall()
             .withTurnId(turn.getId())
             .withConversationId(conversation.getId())
             .withUserId(userId)
             .withToolCallId(use.getToolUseId())
             .withToolName(use.getToolName())
-            .withClientChannel(scheduledTask == null ? "assistant/" + turn.getId() : "assistant/scheduled/" + scheduledTask.getId())
-            .withInputJson(BulkLoadTools.NAMES.contains(use.getToolName()) ? BulkLoadTools.forLog(inputJson) : inputJson)
+            .withInputJson(truncate(redactInput(PresentResultsTool.NAME.equals(use.getToolName()) ? (presentation ? result.getRender() : Map.of()) : use.getInput()), MAX_INPUT_JSON_CHARS))
             .withOutcome(outcome)
             .withPermissionCheck(result.getPermissionCheck())
             .withTableName(result.getTableName())
@@ -1070,7 +862,7 @@ public class TurnEngine implements Runnable
             .withRowCount(result.getRowCount())
             .withDurationMs(result.getDurationMs())
             .withResultSummary(summary)
-            .withResultJson(BulkLoadTools.NAMES.contains(use.getToolName()) ? BulkLoadTools.forLog(result.getModelContent()) : result.getModelContent())
+            .withResultJson(truncate(BulkLoadTools.NAMES.contains(use.getToolName()) ? BulkLoadTools.forLog(result.getModelContent()) : result.getModelContent(), MAX_RESULT_JSON_CHARS))
             .withRedactionsJson(result.getRedactions() == null || result.getRedactions().isEmpty() ? null : JsonUtils.toJson(result.getRedactions()))
             .withUiApiOperation(extras == null ? ("search_knowledge".equals(use.getToolName()) ? "GET /table/{tableName}/{primaryKey}" : null) : extras.getOperation())
             .withHttpStatus(extras == null ? null : extras.getHttpStatus())
@@ -1107,7 +899,7 @@ public class TurnEngine implements Runnable
     *******************************************************************************/
    private UiApiToolbox.Context toolContext()
    {
-      return (new UiApiToolbox.Context(session.getUuid(), userTimezone(), runtime.getUiApiGateway(), toolPolicy, this::proposeWrite, credentials, turn.getId() == null ? null : String.valueOf(turn.getId())));
+      return (new UiApiToolbox.Context(session.getUuid(), userTimezone(), runtime.getUiApiGateway(), policy.tools(), this::proposeWrite));
    }
 
 
@@ -1170,103 +962,93 @@ public class TurnEngine implements Runnable
    /*******************************************************************************
     ** Persist the message, turn, conversation and usage; emit the end events.
     *******************************************************************************/
-   private synchronized void finish(String status, String stopReason, String errorCode, String errorText)
+   private void finish(String status, String stopReason, String errorCode, String errorText)
    {
-      if(!running.tryFinalize())
-      {
-         return;
-      }
-      TranscriptRedactor previousTranscript = TranscriptRedactor.current();
       try
       {
-         attachTranscript();
-         AssistantTurn persistedTurn = null;
-         try
-         {
-            persistedTurn = store.getTurn(userId, turn.getId());
-         }
-         catch(Exception e)
-         {
-            LOG.warn("Could not read final assistant status", hipaaSafe(e), logPair("turnId", turn.getId()));
-         }
-         boolean alreadyTerminal = persistedTurn != null && !("RUNNING".equals(persistedTurn.getStatus()) || "CANCELLING".equals(persistedTurn.getStatus()));
-         if(alreadyTerminal)
-         {
-            status = persistedTurn.getStatus();
-            stopReason = persistedTurn.getStopReason();
-            errorCode = persistedTurn.getErrorCode();
-         }
-         String finalStatus = status;
-         String finalStopReason = stopReason;
-         String finalErrorCode = errorCode;
-         String model = this.model != null ? this.model : (policy == null ? null : policy.mainModel());
+         persistClassification();
+         flushText(true);
          Instant now = runtime.getClock().instant();
-         safely(() -> flushText(true));
-         if(errorText != null && !alreadyTerminal)
+
+         if(errorText != null)
          {
-            parts.addNotice("CANCELLED".equals(status) ? "info" : "error", errorText);
-         }
-         running.setPhase("done", null);
-         if(!alreadyTerminal)
-         {
-            safely(() -> persistClassification());
-            safely(() -> store.updateFields(AssistantMessage.TABLE_NAME, new QRecord()
-               .withValue("id", assistantMessage.getId()).withValue("status", finalStatus)
-               .withValue("model", model).withValue("partsJson", parts.toJson())));
+            parts.addNotice("error", errorText);
          }
 
+         String model = this.model != null ? this.model : (policy == null ? null : policy.mainModel());
+         try
+         {
+            store.updateFields(AssistantMessage.TABLE_NAME, new QRecord()
+               .withValue("id", assistantMessage.getId())
+               .withValue("status", status)
+               .withValue("model", model)
+               .withValue("partsJson", parts.toJson()));
+
+            AssistantConversation current = store.getConversation(userId, conversation.getId());
+            if(current != null)
+            {
+               store.updateFields(AssistantConversation.TABLE_NAME, new QRecord()
+                  .withValue("id", current.getId())
+                  .withValue("lastMessageAt", now)
+                  .withValue("unreadCount", (current.getUnreadCount() == null ? 0 : current.getUnreadCount()) + 1)
+                  .withValue("totalTokensIn", nz(current.getTotalTokensIn()) + nz(usage.getInputTokens()) + nz(usage.getCacheReadTokens()) + nz(usage.getCacheWriteTokens()))
+                  .withValue("totalTokensOut", nz(current.getTotalTokensOut()) + nz(usage.getOutputTokens()))
+                  .withValue("totalCostMicros", nz(current.getTotalCostMicros()) + costMicros));
+            }
+
+            store.addUsage(userId, LocalDate.now(runtime.getClock().withZone(ZoneOffset.UTC)), usage, costMicros, true);
+         }
+         catch(QException e)
+         {
+            LOG.warn("Could not persist the end of an assistant turn", hipaaSafe(e), logPair("turnId", turn.getId()));
+         }
+
+         /////////////////////////////////////////////////////////////////////
+         // terminal events are persisted BEFORE the turn row turns final, //
+         // so a replay of a finished turn always ends with message.end    //
+         /////////////////////////////////////////////////////////////////////
          emit(TurnEvent.USAGE, map("turnId", turn.getId(), "inputTokens", usage.getInputTokens(), "outputTokens", usage.getOutputTokens(),
             "cacheReadTokens", usage.getCacheReadTokens(), "cacheWriteTokens", usage.getCacheWriteTokens(), "costMicros", costMicros));
          if(errorCode != null)
          {
             emit(TurnEvent.ERROR, map("code", errorCode, "message", errorText));
          }
-         emit(TurnEvent.MESSAGE_END, map("messageId", assistantMessage.getId(), "status", status, "stopReason", stopReason));
-         if(!alreadyTerminal)
+         Map<String, Object> end = map("messageId", assistantMessage.getId(), "status", status);
+         if(stopReason != null)
          {
-            safely(this::persistPendingEvents);
-            safely(() -> transcript.flush(store));
-            // Accounting failures cannot skip the terminal row or local cleanup.
-            safely(() ->
-            {
-               store.updateRunningTurn(userId, new QRecord()
-                  .withValue("id", turn.getId())
-                  .withValue("status", finalStatus)
-                  .withValue("phase", "done")
-                  .withValue("stopReason", finalStopReason)
-                  .withValue("errorCode", finalErrorCode)
-                  .withValue("cancelReason", running.getCancelReason())
-                  .withValue("model", model)
-                  .withValue("providerId", active == null ? null : active.providerId())
-                  .withValue("routeDecision", turn.getRouteDecision())
-                  .withValue("routeSource", turn.getRouteSource())
-                  .withValue("fallbackCount", turn.getFallbackCount())
-                  .withValue("endedAt", now)
-                  .withValue("toolCallCount", toolCallCount)
-                  .withValue("modelCallCount", modelCallCount)
-                  .withValue("inputTokens", usage.getInputTokens())
-                  .withValue("outputTokens", usage.getOutputTokens())
-                  .withValue("cacheReadTokens", usage.getCacheReadTokens())
-                  .withValue("cacheWriteTokens", usage.getCacheWriteTokens())
-                  .withValue("costMicros", costMicros)
-                  .withValue("providerRequestIds", requestIds.isEmpty() ? null : String.join(",", requestIds)));
-            });
-            safely(() ->
-            {
-               AssistantConversation current = store.getConversation(userId, conversation.getId());
-               if(current != null)
-               {
-                  store.updateFields(AssistantConversation.TABLE_NAME, new QRecord()
-                     .withValue("id", current.getId())
-                     .withValue("lastMessageAt", now)
-                     .withValue("unreadCount", (current.getUnreadCount() == null ? 0 : current.getUnreadCount()) + 1)
-                     .withValue("totalTokensIn", nz(current.getTotalTokensIn()) + nz(usage.getInputTokens()) + nz(usage.getCacheReadTokens()) + nz(usage.getCacheWriteTokens()))
-                     .withValue("totalTokensOut", nz(current.getTotalTokensOut()) + nz(usage.getOutputTokens()))
-                     .withValue("totalCostMicros", nz(current.getTotalCostMicros()) + costMicros));
-               }
-            });
-            safely(() -> store.addUsage(userId, LocalDate.now(runtime.getClock().withZone(ZoneOffset.UTC)), usage, costMicros, true));
+            end.put("stopReason", stopReason);
          }
+         emit(TurnEvent.MESSAGE_END, end);
+         persistPendingEvents();
+
+         try
+         {
+            store.updateFields(AssistantTurn.TABLE_NAME, new QRecord()
+               .withValue("id", turn.getId())
+               .withValue("status", status)
+               .withValue("stopReason", truncate(stopReason, 64))
+               .withValue("errorCode", errorCode)
+               .withValue("cancelReason", running.getCancelReason())
+               .withValue("model", model)
+               .withValue("providerId", active == null ? null : active.providerId())
+               .withValue("routeDecision", turn.getRouteDecision())
+               .withValue("routeSource", turn.getRouteSource())
+               .withValue("fallbackCount", turn.getFallbackCount())
+               .withValue("endedAt", now)
+               .withValue("toolCallCount", toolCallCount)
+               .withValue("modelCallCount", modelCallCount)
+               .withValue("inputTokens", usage.getInputTokens())
+               .withValue("outputTokens", usage.getOutputTokens())
+               .withValue("cacheReadTokens", usage.getCacheReadTokens())
+               .withValue("cacheWriteTokens", usage.getCacheWriteTokens())
+               .withValue("costMicros", costMicros)
+               .withValue("providerRequestIds", requestIds.isEmpty() ? null : String.join(",", requestIds)));
+         }
+         catch(QException e)
+         {
+            LOG.warn("Could not persist the end of an assistant turn", hipaaSafe(e), logPair("turnId", turn.getId()));
+         }
+
          LOG.info("Assistant turn finished",
             logPair("turnId", turn.getId()),
             logPair("conversationId", conversation.getId()),
@@ -1275,7 +1057,6 @@ public class TurnEngine implements Runnable
             logPair("status", status),
             logPair("stopReason", stopReason),
             logPair("errorCode", errorCode),
-            logPair("cancelReason", running.getCancelReason()),
             logPair("modelCalls", modelCallCount),
             logPair("toolCalls", toolCallCount),
             logPair("inputTokens", usage.getInputTokens()),
@@ -1285,104 +1066,25 @@ public class TurnEngine implements Runnable
             logPair("costMicros", costMicros),
             logPair("durationMs", Duration.between(startedAt, now).toMillis()));
       }
+      catch(QException | RuntimeException e)
+      {
+         LOG.warn("Assistant turn finish failed", hipaaSafe(e), logPair("turnId", turn.getId()));
+      }
       finally
       {
-         finished = true;
          running.getLog().close();
-         safely(() ->
-         {
-            if(scheduledTask != null)
-            {
-               runtime.getScheduledTurn().detach(conversation.getId(), session.getUuid());
-            }
-         });
-         String finalStatus = status;
-         String finalText = errorText;
-         try
-         {
-            safely(() -> config.getRunTracker().finish(running.getTrackingId(), finalStatus, finalText));
-         }
-         finally
-         {
-            runtime.unregister(turn.getId());
-            runtime.getRateLimiter().release(userId);
-            if(transcript != null && !engineRunning)
-            {
-               transcript.close();
-            }
-            else
-            {
-               // A wedged provider can still log after forced finalization. The
-               // engine's finally releases its log protection when it returns.
-               TranscriptRedactor.detach();
-            }
-            if(previousTranscript != null && previousTranscript != transcript)
-            {
-               previousTranscript.attach();
-            }
-         }
+         runtime.unregister(turn.getId());
+         runtime.getRateLimiter().release(userId);
       }
    }
 
 
 
-   /*******************************************************************************
-    ** One independently fallible finalization operation.
-    *******************************************************************************/
-   @FunctionalInterface
-   private interface FinishStep
-   {
-      /*******************************************************************************
-       ** Execute the step.
-       *******************************************************************************/
-      void run() throws Exception;
-   }
-
-
-
-   /*******************************************************************************
-    ** A failure in a collaborator must not strand the run.
-    *******************************************************************************/
-   private void safely(FinishStep step)
-   {
-      try
-      {
-         step.run();
-      }
-      catch(Exception e)
-      {
-         LOG.warn("Assistant lifecycle step failed", hipaaSafe(e), logPair("turnId", turn.getId()));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Emit and track only phase changes, including the current tool label.
-    *******************************************************************************/
-   private synchronized void phase(String phase, String toolName)
-   {
-      if(running.isFinalized() || (phase.equals(running.getPhase()) && Objects.equals(toolName, running.getToolName())))
-      {
-         return;
-      }
-      running.setPhase(phase, toolName);
-      String label = toolName == null ? phase : ToolLabels.running(toolName);
-      emit(TurnEvent.TURN_PHASE, map("phase", phase, "toolName", toolName, "label", label));
-      safely(() -> config.getRunTracker().progress(running.getTrackingId(), phase, label));
-   }
-
-
-
    /*******************************************************************************
     ** Buffer streamed text; emit it in small chunks (provider thread).
     *******************************************************************************/
-   private synchronized void bufferText(String text)
+   private void bufferText(String text)
    {
-      if(running.isFinalized())
-      {
-         return;
-      }
       synchronized(textBuffer)
       {
          textBuffer.append(text);
@@ -1395,7 +1097,7 @@ public class TurnEngine implements Runnable
    /*******************************************************************************
     ** Emit buffered text as one text.delta (when big or old enough, or forced).
     *******************************************************************************/
-   private synchronized void flushText(boolean force)
+   private void flushText(boolean force)
    {
       String chunk;
       synchronized(textBuffer)
@@ -1430,12 +1132,8 @@ public class TurnEngine implements Runnable
     ** Append to the live log; queue for persistence (done on the engine
     ** thread, which has the QContext).
     *******************************************************************************/
-   private synchronized void emit(String type, Map<String, Object> data)
+   private void emit(String type, Map<String, Object> data)
    {
-      if(finished)
-      {
-         return;
-      }
       toPersist.add(running.getLog().append(type, data));
    }
 
@@ -1444,44 +1142,18 @@ public class TurnEngine implements Runnable
    /*******************************************************************************
     ** Persist queued events.
     *******************************************************************************/
-   private synchronized void persistPendingEvents()
+   private void persistPendingEvents()
    {
-      if(!running.isFinalized() || finished)
-      {
-         return;
-      }
-      List<TurnEvent> events = new ArrayList<>();
       TurnEvent event;
       while((event = toPersist.poll()) != null)
-      {
-         events.add(event);
-      }
-      StringBuilder text = new StringBuilder();
-      for(TurnEvent queued : events)
-      {
-         if(TurnEvent.TEXT_DELTA.equals(queued.getType()))
-         {
-            text.append(queued.getData().get("text"));
-         }
-      }
-      Boolean firstText = true;
-      for(TurnEvent queued : events)
       {
          try
          {
-            String json = queued.toJson();
-            if(TurnEvent.TEXT_DELTA.equals(queued.getType()))
-            {
-               Map<String, Object> data = new LinkedHashMap<>(queued.getData());
-               data.put("text", firstText ? text.toString() : "");
-               firstText = false;
-               json = JsonUtils.toJson(data);
-            }
-            store.insertEvent(turn.getId(), userId, queued.getSeq(), queued.getType(), json);
+            store.insertEvent(turn.getId(), userId, event.getSeq(), event.getType(), event.toJson());
          }
-         catch(Exception e)
+         catch(QException e)
          {
-            LOG.warn("Could not persist assistant turn event", hipaaSafe(e), logPair("turnId", turn.getId()), logPair("seq", queued.getSeq()));
+            LOG.warn("Could not persist assistant turn event", hipaaSafe(e), logPair("turnId", turn.getId()), logPair("seq", event.getSeq()));
          }
       }
    }
@@ -1528,6 +1200,16 @@ public class TurnEngine implements Runnable
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   private static String truncate(String value, int max)
+   {
+      return (value == null || value.length() <= max ? value : value.substring(0, max));
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/TurnEvent.java

@@ -29,7 +29,6 @@ import com.kingsrook.qqq.backend.core.utils.JsonUtils;
  *******************************************************************************/
 public class TurnEvent
 {
-   public static final String TURN_PHASE = "turn.phase";
    public static final String MESSAGE_START = "message.start";
    public static final String TEXT_DELTA    = "text.delta";
    public static final String TOOL_START    = "tool.start";

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/engine/UsageRecorder.java

@@ -17,13 +17,11 @@
 package com.kingsrook.qbits.assistant.engine;
 
 
-import com.kingsrook.qbits.assistant.persistence.TranscriptRedactor;
 import com.kingsrook.qbits.assistant.model.AssistantUsage;
 import com.kingsrook.qbits.assistant.persistence.AssistantStore;
-import com.kingsrook.qbits.assistant.spi.ModelPricing;
-import com.kingsrook.qbits.assistant.spi.ModelProviderException;
-import com.kingsrook.qbits.assistant.spi.ModelResponse;
-import com.kingsrook.qbits.assistant.spi.ModelUsage;
+import com.kingsrook.qbits.assistant.provider.ModelProviderException;
+import com.kingsrook.qbits.assistant.provider.ModelResponse;
+import com.kingsrook.qbits.assistant.provider.ModelUsage;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
@@ -146,10 +144,6 @@ public final class UsageRecorder
     *******************************************************************************/
    private static String truncate(String value, int max)
    {
-      if(value != null && value.length() > max && TranscriptRedactor.current() != null)
-      {
-         TranscriptRedactor.current().truncated(value, value.substring(0, max));
-      }
       return (value == null || value.length() <= max ? value : value.substring(0, max));
    }
 

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/home/AssistantHomeData.java

@@ -17,15 +17,7 @@
 package com.kingsrook.qbits.assistant.home;
 
 
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.kingsrook.qbits.assistant.model.AssistantTurn;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
 import com.kingsrook.qbits.assistant.AssistantSecurity;
 import com.kingsrook.qbits.assistant.engine.BudgetService;
@@ -37,15 +29,23 @@ import com.kingsrook.qbits.assistant.model.AssistantBudgetOverride;
 import com.kingsrook.qbits.assistant.model.AssistantConversation;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
 import com.kingsrook.qbits.assistant.model.AssistantToolCall;
-import com.kingsrook.qbits.assistant.model.AssistantTurn;
 import com.kingsrook.qbits.assistant.model.AssistantUsage;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterOrderBy;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 /*******************************************************************************
@@ -75,7 +75,6 @@ public class AssistantHomeData
    private final List<Totals> byProvider = new ArrayList<>();
 
    private Long fallbackCount = 0L;
-   private List<AssistantSetupStatus.Item> setup = List.of();
    private Boolean hipaaMode;
    private Integer hipaaRetentionDays;
    private LocalDate today;
@@ -314,7 +313,6 @@ public class AssistantHomeData
          data.providers.add(new ProviderHealth(row, type == null ? row.getProviderType() : type.getLabel(), status, (status.startsWith("Set") || status.startsWith("Not needed")), service.validate(row), active != null && active.getId().equals(row.getId()),
             providerMonth.getOrDefault(row.getId(), 0L), ProviderService.capMicros(row), service.kind(row), service.location(row), service.models(row.getId()).stream().filter(m -> Boolean.TRUE.equals(m.getEnabled())).count()));
       }
-      data.setup = AssistantSetupStatus.load(runtime, data.providers);
       return (data);
    }
 
@@ -580,15 +578,4 @@ public class AssistantHomeData
    {
       return (fallbackCount);
    }
-
-
-
-   /*******************************************************************************
-    ** The Setup card: each configuration table, its state and the next step.
-    *******************************************************************************/
-   public List<AssistantSetupStatus.Item> getSetup()
-   {
-      return (setup);
-   }
-
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/home/AssistantHomeView.java

@@ -90,7 +90,6 @@ public final class AssistantHomeView
    public static String render(AssistantHomeData data, String prefix)
    {
       StringBuilder html = new StringBuilder("<div class=\"assistant-home\" style=\"" + ROOT + "\">");
-      setup(html, data, prefix);
       status(html, data, prefix);
       providers(html, data, prefix);
       html.append("<div style=\"").append(GRID).append("\">");
@@ -112,52 +111,6 @@ public final class AssistantHomeView
 
 
 
-   /*******************************************************************************
-    ** The Setup card: each part of the assistant, set up or not, and the next
-    ** step, linked to its table.
-    *******************************************************************************/
-   private static void setup(StringBuilder html, AssistantHomeData data, String prefix)
-   {
-      if(data.getSetup().isEmpty())
-      {
-         return;
-      }
-      open(html, "Setup");
-      long todo = data.getSetup().stream().filter(i -> i.state() == AssistantSetupStatus.State.TODO).count();
-      html.append("<p style=\"margin:0 0 .6rem;font-size:.9rem;\">")
-         .append(todo == 0 ? "Everything the assistant needs is set up." : esc(todo + (todo == 1 ? " item needs" : " items need") + " attention."))
-         .append("</p><ul style=\"list-style:none;margin:0;padding:0;\">");
-      for(AssistantSetupStatus.Item item : data.getSetup())
-      {
-         String color = switch(item.state())
-         {
-            case OK -> GREEN;
-            case TODO -> RED;
-            case DEFAULT -> AMBER;
-            case OPTIONAL -> GREY;
-         };
-         String label = switch(item.state())
-         {
-            case OK -> "Set up";
-            case TODO -> "Needs setup";
-            case DEFAULT -> "Using defaults";
-            case OPTIONAL -> "Optional";
-         };
-         html.append("<li style=\"").append(ROW).append("\"><div style=\"display:flex;flex-wrap:wrap;align-items:center;gap:.5rem .75rem;\">")
-            .append("<strong><a style=\"").append(LINK).append("\" href=\"").append(esc(prefix + "/" + item.tableName())).append("\">").append(esc(item.label())).append("</a></strong>")
-            .append(chip(color, label)).append("</div><div style=\"font-size:.9rem;margin-top:.35rem;\">").append(esc(item.detail())).append("</div>");
-         if(item.nextStep() != null)
-         {
-            html.append("<div style=\"").append(MUTED).append("font-size:.9rem;margin-top:.2rem;\">Next: ").append(esc(item.nextStep())).append("</div>");
-         }
-         html.append("</li>");
-      }
-      html.append("</ul>");
-      close(html);
-   }
-
-
-
    /*******************************************************************************
     ** The status row: is the assistant answering, with what, at what cost.
     *******************************************************************************/

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/home/AssistantSetupStatus.java

@@ -1,231 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.home;
-
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import com.kingsrook.qbits.assistant.AssistantRuntime;
-import com.kingsrook.qbits.assistant.engine.ProviderService;
-import com.kingsrook.qbits.assistant.model.AssistantBudget;
-import com.kingsrook.qbits.assistant.model.AssistantDataAccess;
-import com.kingsrook.qbits.assistant.model.AssistantModelPrice;
-import com.kingsrook.qbits.assistant.model.AssistantPolicy;
-import com.kingsrook.qbits.assistant.model.AssistantProfile;
-import com.kingsrook.qbits.assistant.model.AssistantProfileSkill;
-import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qbits.assistant.model.AssistantRagSource;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledTask;
-import com.kingsrook.qbits.assistant.model.AssistantSkill;
-import com.kingsrook.qbits.assistant.persistence.AssistantStore;
-import com.kingsrook.qbits.assistant.spi.ModelPricing;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
-import com.kingsrook.qqq.backend.core.model.data.QRecordEntity;
-
-
-/*******************************************************************************
- ** The Setup card on the Assistant home: each configuration table, whether it
- ** is set up, and the next step. Only reads the QBit's own configuration
- ** tables (small), as the signed-in administrator.
- *******************************************************************************/
-public final class AssistantSetupStatus
-{
-   private static final int LIMIT = 1000;
-
-
-
-   /*******************************************************************************
-    ** OK: working. TODO: the assistant needs it. DEFAULT: working on built-in
-    ** defaults (nothing to do). OPTIONAL: a feature that is off until set up.
-    *******************************************************************************/
-   public enum State
-   {
-      OK, TODO, DEFAULT, OPTIONAL
-   }
-
-
-
-   /*******************************************************************************
-    ** One line of the card.
-    *******************************************************************************/
-   public record Item(String label, String tableName, State state, String detail, String nextStep)
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private AssistantSetupStatus()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** Build the items. `providers` is what the home already loaded.
-    *******************************************************************************/
-   public static List<Item> load(AssistantRuntime runtime, List<AssistantHomeData.ProviderHealth> providers) throws QException
-   {
-      AssistantStore store = runtime.getStore();
-      List<Item>     items = new ArrayList<>();
-
-      ///////////////
-      // providers //
-      ///////////////
-      AssistantHomeData.ProviderHealth active = providers.stream().filter(AssistantHomeData.ProviderHealth::active).findFirst().orElse(null);
-      if(active != null && active.keyPresent() && active.problems().isEmpty())
-      {
-         items.add(new Item("Provider", AssistantProvider.TABLE_NAME, State.OK, active.row().getName() + " answers questions.", null));
-      }
-      else if(providers.isEmpty())
-      {
-         items.add(new Item("Provider", AssistantProvider.TABLE_NAME, State.TODO, "No provider yet.", "Add one with New: pick the type and model, and name the environment variable that holds the API key."));
-      }
-      else
-      {
-         items.add(new Item("Provider", AssistantProvider.TABLE_NAME, State.TODO, "The default provider cannot be used.", "Turn one on, set it as default, make sure its key variable is set, then run Test connection."));
-      }
-
-      //////////////////////////////////////////////////////////////////////
-      // prices: resolved exactly as calls are costed (registry row, price //
-      // row, then the configured price table); local models cost nothing //
-      //////////////////////////////////////////////////////////////////////
-      int priceRows = store.query(AssistantModelPrice.TABLE_NAME, new QQueryFilter().withLimit(LIMIT), AssistantModelPrice.class).size();
-      String rowsText = priceRows + " price row" + (priceRows == 1 ? "" : "s");
-      if(active == null)
-      {
-         items.add(new Item("Model prices", AssistantModelPrice.TABLE_NAME, State.DEFAULT, rowsText + "; checked once a provider answers.", null));
-      }
-      else
-      {
-         AssistantProvider row   = active.row();
-         ModelPricing      price = runtime.getProviderService().pricing(new ProviderService.Active(row, row.getProviderType(), row.getModel(), null), row.getModel());
-         boolean           local = "LOCAL".equals(active.location());
-         boolean           known = price != null && (positive(price.getInputUsdPerMTok()) || positive(price.getOutputUsdPerMTok()));
-         items.add(known || local
-            ? new Item("Model prices", AssistantModelPrice.TABLE_NAME, State.OK, local && !known ? "The default model is local and costs nothing. " + rowsText + "."
-               : "The default model is priced at $" + price.getInputUsdPerMTok() + " in / $" + price.getOutputUsdPerMTok() + " out per million tokens. " + rowsText + ".", null)
-            : new Item("Model prices", AssistantModelPrice.TABLE_NAME, State.TODO, "The default model (" + row.getModel() + ") has no price, so its calls cost $0 and cost budgets never trigger.",
-               "Add a price row for its provider type and model."));
-      }
-
-      ////////////
-      // policy //
-      ////////////
-      List<AssistantPolicy> policies = store.query(AssistantPolicy.TABLE_NAME, new QQueryFilter().withLimit(1), AssistantPolicy.class);
-      if(policies.isEmpty())
-      {
-         items.add(new Item("Policy", AssistantPolicy.TABLE_NAME, State.DEFAULT, "No policy row: the code configuration applies.", "Add one to control the kill switch, confirmations and tool limits here."));
-      }
-      else if(Boolean.TRUE.equals(policies.get(0).getKillSwitch()))
-      {
-         items.add(new Item("Policy", AssistantPolicy.TABLE_NAME, State.TODO, "The kill switch is on: the assistant answers nothing.", "Turn it off on the policy row when ready."));
-      }
-      else
-      {
-         items.add(new Item("Policy", AssistantPolicy.TABLE_NAME, State.OK, "Writes " + (Boolean.FALSE.equals(policies.get(0).getWritesRequireConfirmation()) ? "do not wait" : "wait") + " for confirmation.", null));
-      }
-
-      ////////////////////////
-      // profiles and skills //
-      ////////////////////////
-      List<AssistantProfile> profiles = enabled(store.query(AssistantProfile.TABLE_NAME, new QQueryFilter().withLimit(LIMIT), AssistantProfile.class));
-      boolean hasDefault = profiles.stream().anyMatch(p -> Boolean.TRUE.equals(p.getIsDefault()));
-      items.add(profiles.isEmpty()
-         ? new Item("Profiles", AssistantProfile.TABLE_NAME, State.DEFAULT, "No profile: the built-in assistant answers, with no skills.", "Add a default profile to name the assistant, set its tone and offer skills.")
-         : new Item("Profiles", AssistantProfile.TABLE_NAME, hasDefault ? State.OK : State.DEFAULT,
-            profiles.size() + " profile" + (profiles.size() == 1 ? "" : "s") + (hasDefault ? ", with a default." : ", none of them the default."),
-            hasDefault ? null : "Mark one as the default so it applies everywhere else."));
-
-      Set<Integer> linkedSkillIds = new HashSet<>();
-      Set<Integer> profileIds     = new HashSet<>(profiles.stream().map(AssistantProfile::getId).toList());
-      for(AssistantProfileSkill link : store.query(AssistantProfileSkill.TABLE_NAME, new QQueryFilter().withLimit(LIMIT * 5), AssistantProfileSkill.class))
-      {
-         if(profileIds.contains(link.getProfileId()))
-         {
-            linkedSkillIds.add(link.getSkillId());
-         }
-      }
-      List<AssistantSkill> skills  = enabled(store.query(AssistantSkill.TABLE_NAME, new QQueryFilter().withLimit(LIMIT), AssistantSkill.class));
-      long                 offered = skills.stream().filter(s -> linkedSkillIds.contains(s.getId())).count();
-      items.add(skills.isEmpty()
-         ? new Item("Skills", AssistantSkill.TABLE_NAME, State.OPTIONAL, "No skills.", "Write know-how for your business terms, then link it to a profile.")
-         : offered == 0
-            ? new Item("Skills", AssistantSkill.TABLE_NAME, State.TODO, skills.size() + " skill" + (skills.size() == 1 ? "" : "s") + ", but none is linked to a turned-on profile, so the model never sees them.", "Link them to a profile (Profile skills).")
-            : new Item("Skills", AssistantSkill.TABLE_NAME, State.OK, offered + " of " + skills.size() + " skill" + (skills.size() == 1 ? " is" : "s are") + " offered through a profile.", null));
-
-      /////////////
-      // budgets //
-      /////////////
-      List<AssistantBudget> budgets = store.budgets();
-      items.add(budgets.isEmpty()
-         ? new Item("Budgets", AssistantBudget.TABLE_NAME, State.TODO, "No budget: spending is limited only by the policy's configured caps.", "Add a monthly instance budget (warn, downgrade, stop).")
-         : new Item("Budgets", AssistantBudget.TABLE_NAME, State.OK, budgets.size() + " budget" + (budgets.size() == 1 ? "" : "s") + " checked before every question.", null));
-
-      /////////////////
-      // data access //
-      /////////////////
-      int accessRows = store.query(AssistantDataAccess.TABLE_NAME, new QQueryFilter().withLimit(LIMIT), AssistantDataAccess.class).size();
-      items.add(accessRows == 0
-         ? new Item("Data access", AssistantDataAccess.TABLE_NAME, State.DEFAULT, "Defaults: the assistant may read what each user can read; it proposes no changes.",
-            "Run Add rows for every table to review them, then raise tables to READ_WRITE where it may propose changes.")
-         : new Item("Data access", AssistantDataAccess.TABLE_NAME, State.OK, accessRows + " row" + (accessRows == 1 ? "" : "s") + "; tables without a row use the default.", null));
-
-      ///////////////////////////////////////
-      // optional: knowledge and schedules //
-      ///////////////////////////////////////
-      long sources = enabled(store.query(AssistantRagSource.TABLE_NAME, new QQueryFilter().withLimit(LIMIT), AssistantRagSource.class)).size();
-      items.add(sources == 0
-         ? new Item("Knowledge sources", AssistantRagSource.TABLE_NAME, State.OPTIONAL, "Off: search by meaning is not offered.", "Add a source (a readable table, its text fields and an embedding model), then index it.")
-         : new Item("Knowledge sources", AssistantRagSource.TABLE_NAME, State.OK, sources + " source" + (sources == 1 ? "" : "s") + " turned on.", null));
-
-      List<AssistantScheduledTask> tasks = store.query(AssistantScheduledTask.TABLE_NAME, new QQueryFilter().withLimit(LIMIT), AssistantScheduledTask.class);
-      long onTasks = tasks.stream().filter(t -> Boolean.TRUE.equals(t.getEnabled())).count();
-      items.add(onTasks == 0
-         ? new Item("Scheduled tasks", AssistantScheduledTask.TABLE_NAME, State.OPTIONAL, tasks.isEmpty() ? "None." : tasks.size() + " task" + (tasks.size() == 1 ? "" : "s") + ", all turned off.",
-            "Set a run-as user and an allowed credential variable on a task, then turn it on.")
-         : new Item("Scheduled tasks", AssistantScheduledTask.TABLE_NAME, State.OK, onTasks + " task" + (onTasks == 1 ? "" : "s") + " turned on.", null));
-      return (items);
-   }
-
-
-
-   /*******************************************************************************
-    ** Rows not explicitly turned off.
-    *******************************************************************************/
-   private static <T extends QRecordEntity> List<T> enabled(List<T> rows)
-   {
-      return (rows.stream().filter(row -> !Boolean.FALSE.equals(row.toQRecord().getValueBoolean("enabled"))).toList());
-   }
-
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private static boolean positive(Double value)
-   {
-      return (value != null && value > 0);
-   }
-
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/jobs/AssistantRunTracker.java

@@ -1,75 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.jobs;
-
-
-/*******************************************************************************
- ** STAND-IN(core=QRun-IO/qqq#1210, removeBy=RC.9): core job tracking
- ** (jobs_job tracking rows) will implement this contract; hosts may wire their own.
- *******************************************************************************/
-public interface AssistantRunTracker
-{
-   AssistantRunTracker NOOP = new AssistantRunTracker()
-   {
-      /*******************************************************************************
-       ** No tracking is configured.
-       *******************************************************************************/
-      @Override
-      public String start(String userId, Integer turnId, Integer conversationId, String label)
-      {
-         return (null);
-      }
-
-      /*******************************************************************************
-       ** No tracking is configured.
-       *******************************************************************************/
-      @Override
-      public void progress(String trackingId, String phase, String message)
-      {
-      }
-
-      /*******************************************************************************
-       ** No tracking is configured.
-       *******************************************************************************/
-      @Override
-      public void finish(String trackingId, String status, String message)
-      {
-      }
-   };
-
-   /*******************************************************************************
-    ** Publish a run and return its tracking id.
-    *******************************************************************************/
-   String start(String userId, Integer turnId, Integer conversationId, String label);
-
-   /*******************************************************************************
-    ** Publish a changed phase.
-    *******************************************************************************/
-   void progress(String trackingId, String phase, String message);
-
-   /*******************************************************************************
-    ** Publish the terminal outcome.
-    *******************************************************************************/
-   void finish(String trackingId, String status, String message);
-
-   /*******************************************************************************
-    ** Wire the host's Stop action to the owner's cancellation path.
-    *******************************************************************************/
-   default void onCancel(String trackingId, Runnable cancel)
-   {
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/metadata/AssistantChannelWall.java

@@ -1,96 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.metadata;
-
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import com.kingsrook.qbits.assistant.AssistantQBitProducer;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-import com.kingsrook.qqq.backend.core.model.metadata.permissions.ClientChannelsMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.permissions.MetaDataWithPermissionRules;
-import com.kingsrook.qqq.backend.core.model.metadata.permissions.QPermissionRules;
-import com.kingsrook.qqq.backend.core.model.metadata.qbits.SourceQBitAware;
-
-
-/*******************************************************************************
- ** Register and verify the assistant's configuration wall beneath user permissions.
- *******************************************************************************/
-public final class AssistantChannelWall
-{
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private AssistantChannelWall()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** Enumerate the instance so new assistant metadata cannot miss registration.
-    ** Preserve host permissions and other denied channels.
-    *******************************************************************************/
-   public static void register(QInstance qInstance)
-   {
-      ClientChannelsMetaData.ofOrWithNew(qInstance).withDeniedPattern("assistant", "assistant_*");
-      for(MetaDataWithPermissionRules object : objects(qInstance))
-      {
-         QPermissionRules rules = object.getPermissionRules();
-         rules = rules == null ? qInstance.getDefaultPermissionRules().clone() : rules.clone();
-         Set<String> denied = new HashSet<>(rules.getDeniedClients() == null ? Set.of() : rules.getDeniedClients());
-         denied.add("assistant");
-         object.setPermissionRules(rules.withDeniedClients(denied));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Fail before runtime initialization if a host customization opens the wall.
-    *******************************************************************************/
-   public static void validate(QInstance qInstance)
-   {
-      ClientChannelsMetaData channels = ClientChannelsMetaData.of(qInstance);
-      for(MetaDataWithPermissionRules object : objects(qInstance))
-      {
-         QPermissionRules rules = object.getPermissionRules() == null ? qInstance.getDefaultPermissionRules() : object.getPermissionRules();
-         if(!channels.isDenied("assistant", object.getName(), rules))
-         {
-            throw (new IllegalStateException("Assistant channel wall: " + object.getName() + " must be denied to client channel assistant before startup."));
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Tables, processes, reports and widgets, including host-added assistant objects.
-    *******************************************************************************/
-   private static List<MetaDataWithPermissionRules> objects(QInstance qInstance)
-   {
-      List<MetaDataWithPermissionRules> objects = new ArrayList<>();
-      objects.addAll(qInstance.getTables().values());
-      objects.addAll(qInstance.getProcesses().values());
-      objects.addAll(qInstance.getReports().values());
-      objects.addAll(qInstance.getWidgets().values());
-      return (objects.stream().filter(object -> (object.getName() != null && object.getName().startsWith("assistant"))
-         || (object instanceof SourceQBitAware source && (AssistantQBitProducer.GROUP_ID + ":" + AssistantQBitProducer.ARTIFACT_ID).equals(source.getSourceQBitName()))).toList());
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/metadata/AssistantHelp.java

@@ -1,126 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.metadata;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-import com.kingsrook.qqq.backend.core.model.metadata.help.QHelpContent;
-import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
-
-
-/*******************************************************************************
- ** Applies help/qbit-assistant.yaml (the QQQ help-bundle format) to the
- ** Assistant app and its assistant_* tables: what each table is for and how
- ** its rows get created, shown on the table screen and when it is empty.
- ** STAND-IN(core=#1198): replace with HelpBundles.register once the pinned
- ** QQQ release includes it; the bundle file stays the same.
- *******************************************************************************/
-public final class AssistantHelp
-{
-   public static final String RESOURCE = "/help/qbit-assistant.yaml";
-   public static final String SLOT     = "help";
-
-
-
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private AssistantHelp()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** The bundle's entries by key, validated (fails startup if malformed).
-    *******************************************************************************/
-   public static Map<String, JsonNode> entries() throws QException
-   {
-      try(InputStream stream = AssistantHelp.class.getResourceAsStream(RESOURCE))
-      {
-         if(stream == null)
-         {
-            throw (new IOException("missing resource"));
-         }
-         JsonNode bundle = new ObjectMapper(new YAMLFactory()).readTree(stream);
-         if(!"qbit-assistant".equals(bundle.path("bundle").asText()) || !"QBIT".equals(bundle.path("layer").asText()))
-         {
-            throw (new IOException("invalid bundle header"));
-         }
-         Map<String, JsonNode> entries = new LinkedHashMap<>();
-         for(JsonNode entry : bundle.path("entries"))
-         {
-            String key     = entry.path("key").asText();
-            String summary = entry.path("summary").asText();
-            if(key.isBlank() || summary.isBlank() || summary.length() > 120 || entry.path("content").asText().isBlank() || entries.put(key, entry) != null)
-            {
-               throw (new IOException("invalid or duplicate entry: " + key));
-            }
-         }
-         return (entries);
-      }
-      catch(IOException | RuntimeException e)
-      {
-         throw (new QException("Could not load " + RESOURCE, e));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Apply the help to the app and every assistant_* table in the instance.
-    ** A host's own help on a table is kept (the bundle only fills the slot).
-    *******************************************************************************/
-   public static void apply(QInstance qInstance) throws QException
-   {
-      Map<String, JsonNode> entries = entries();
-      for(QTableMetaData table : qInstance.getTables().values())
-      {
-         JsonNode entry = entries.get("table:" + table.getName() + ";slot:" + SLOT);
-         if(entry != null && (table.getHelpContent() == null || !table.getHelpContent().containsKey(SLOT)))
-         {
-            table.withHelpContent(SLOT, content(entry));
-         }
-      }
-      QAppMetaData app = qInstance.getApp(AssistantMetaDataBuilder.APP_NAME);
-      JsonNode     appEntry = entries.get("app:" + AssistantMetaDataBuilder.APP_NAME + ";slot:" + SLOT);
-      if(app != null && appEntry != null && (app.getHelpContent() == null || !app.getHelpContent().containsKey(SLOT)))
-      {
-         app.withHelpContent(SLOT, content(appEntry));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Summary as the first paragraph, then the content, as markdown.
-    *******************************************************************************/
-   static QHelpContent content(JsonNode entry)
-   {
-      return (new QHelpContent().withContentAsMarkdown(entry.path("summary").asText().strip() + "\n\n" + entry.path("content").asText().strip()));
-   }
-
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/metadata/AssistantMetaDataBuilder.java

@@ -17,8 +17,6 @@
 package com.kingsrook.qbits.assistant.metadata;
 
 
-import java.util.ArrayList;
-import java.util.List;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
 import com.kingsrook.qbits.assistant.home.AssistantAccessWidget;
 import com.kingsrook.qbits.assistant.home.AssistantHome;
@@ -32,15 +30,13 @@ import com.kingsrook.qbits.assistant.model.AssistantDataAudit;
 import com.kingsrook.qbits.assistant.model.AssistantFeedback;
 import com.kingsrook.qbits.assistant.model.AssistantMessage;
 import com.kingsrook.qbits.assistant.model.AssistantModel;
+import com.kingsrook.qbits.assistant.model.AssistantRagSource;
 import com.kingsrook.qbits.assistant.model.AssistantModelPrice;
 import com.kingsrook.qbits.assistant.model.AssistantPendingAction;
 import com.kingsrook.qbits.assistant.model.AssistantPolicy;
 import com.kingsrook.qbits.assistant.model.AssistantProfile;
 import com.kingsrook.qbits.assistant.model.AssistantProfileSkill;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qbits.assistant.model.AssistantRagSource;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledRun;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledTask;
 import com.kingsrook.qbits.assistant.model.AssistantSkill;
 import com.kingsrook.qbits.assistant.model.AssistantToolCall;
 import com.kingsrook.qbits.assistant.model.AssistantTurn;
@@ -72,6 +68,8 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.Capability;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.UniqueKey;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /*******************************************************************************
@@ -113,7 +111,7 @@ public class AssistantMetaDataBuilder
     ** calls on a conversation; model calls on a provider) or reached from the
     ** home. Processes are table and record actions, never nav entries.
     *******************************************************************************/
-   public static final List<String> NAV_TABLES = List.of(AssistantScheduledTask.TABLE_NAME, AssistantRagSource.TABLE_NAME, AssistantBudget.TABLE_NAME, AssistantProvider.TABLE_NAME, AssistantProfile.TABLE_NAME, AssistantSkill.TABLE_NAME, AssistantDataAccess.TABLE_NAME, AssistantConversation.TABLE_NAME, AssistantModelPrice.TABLE_NAME, AssistantPolicy.TABLE_NAME);
+   public static final List<String> NAV_TABLES = List.of(AssistantRagSource.TABLE_NAME, AssistantBudget.TABLE_NAME, AssistantProvider.TABLE_NAME, AssistantProfile.TABLE_NAME, AssistantSkill.TABLE_NAME, AssistantDataAccess.TABLE_NAME, AssistantConversation.TABLE_NAME, AssistantModelPrice.TABLE_NAME, AssistantPolicy.TABLE_NAME);
 
    private final AssistantQBitConfig config;
 
@@ -189,17 +187,6 @@ public class AssistantMetaDataBuilder
          .withUniqueKey(new UniqueKey("name"))
          .withRecordLabelFormat("%s").withRecordLabelFields("name"));
 
-      QCodeReference scheduledCustomizer = new QCodeReference(AssistantScheduledTaskCustomizer.class);
-      tables.add(text(base(AssistantScheduledTask.TABLE_NAME, "Scheduled tasks", "schedule", AssistantScheduledTask.class), "prompt")
-         .withRecordLabelFormat("%s").withRecordLabelFields("name")
-         .withCustomizer(TableCustomizers.PRE_INSERT_RECORD, scheduledCustomizer).withCustomizer(TableCustomizers.PRE_UPDATE_RECORD, scheduledCustomizer)
-         .withCustomizer(TableCustomizers.POST_QUERY_RECORD, scheduledCustomizer));
-      tables.add(readOnly(owned(base(AssistantScheduledRun.TABLE_NAME, "Scheduled runs", "history", AssistantScheduledRun.class), false))
-         .withoutCapabilities(Capability.TABLE_DELETE)
-         .withPermissionRules(new QPermissionRules().withLevel(PermissionLevel.NOT_PROTECTED))
-         .withUniqueKey(new UniqueKey("taskId", "scheduledFor"))
-         .withRecordLabelFormat("Run #%s").withRecordLabelFields("id"));
-
       QCodeReference ragCustomizer = new QCodeReference(AssistantRagSourceCustomizer.class);
       tables.add(text(base(AssistantRagSource.TABLE_NAME, "Knowledge sources", "manage_search", AssistantRagSource.class), "filterJson")
          .withRecordLabelFormat("%s").withRecordLabelFields("name")

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/metadata/AssistantRecordScreens.java

@@ -43,20 +43,18 @@ import com.kingsrook.qbits.assistant.model.AssistantProfile;
 import com.kingsrook.qbits.assistant.model.AssistantProfileSkill;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
 import com.kingsrook.qbits.assistant.model.AssistantRagSource;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledRun;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledTask;
 import com.kingsrook.qbits.assistant.model.AssistantSkill;
 import com.kingsrook.qbits.assistant.model.AssistantToolCall;
 import com.kingsrook.qbits.assistant.model.AssistantTurn;
 import com.kingsrook.qbits.assistant.model.AssistantTurnEvent;
 import com.kingsrook.qbits.assistant.model.AssistantUsage;
 import com.kingsrook.qbits.assistant.model.AssistantUsageDaily;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
 import com.kingsrook.qqq.backend.core.actions.dashboard.widgets.ChildRecordListRenderer;
 import com.kingsrook.qqq.backend.core.instances.QInstanceEnricher;
+import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReferenceWithProperties;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.AdornmentType;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.DisplayFormat;
@@ -134,8 +132,6 @@ public final class AssistantRecordScreens
       }
 
       return (List.of(
-         QPossibleValueSource.newForTable(AssistantScheduledTask.TABLE_NAME),
-         enumSource("assistant_scheduled_output", List.of(new QPossibleValue<>("RECORD", "Record"), new QPossibleValue<>("NOTIFICATION", "Notification"), new QPossibleValue<>("BOTH", "Both"))),
          QPossibleValueSource.newForTable(AssistantBudget.TABLE_NAME),
          QPossibleValueSource.newForTable(AssistantModel.TABLE_NAME).withName("assistant_registry_model"),
          QPossibleValueSource.newForTable(AssistantModel.TABLE_NAME).withName("assistant_budget_model"),
@@ -177,32 +173,6 @@ public final class AssistantRecordScreens
    {
       switch(table.getName())
       {
-         case AssistantScheduledTask.TABLE_NAME ->
-         {
-            link(table, "profileId", AssistantProfile.TABLE_NAME, "Profile");
-            pvs(table, "outputMode", "assistant_scheduled_output", "Output mode");
-            help(table, "credentialEnvName", "Name of an allowed environment variable holding this user's access token. Never enter the token here.");
-            help(table, "cronExpression", "Quartz cron expression, including seconds; for example 0 0 8 * * ? for 08:00 daily.");
-            help(table, "timezone", "IANA time zone, for example America/Chicago. Defaults to UTC; daylight saving time follows this zone.");
-            help(table, "writeModeRequested", "Requires administrator approval of this exact prompt and identity. Each proposed write still requires the user's confirmation.");
-            help(table, "maxCostUsdPerRun", "Optional USD STOP cap. Checked before each model or embedding call; a completed call may cross the cap.");
-            sections(table,
-               section("task", "Task", "schedule", Tier.T1, "id", "name", "enabled", "prompt", "profileId"),
-               section("identity", "Run as", "person", Tier.T2, "runAsUserId", "credentialEnvName", "credentialStatus"),
-               section("schedule", "Schedule and output", "event", Tier.T2, "cronExpression", "timezone", "nextRunAt", "outputMode", "maxCostUsdPerRun"),
-               section("approval", "Write approval", "verified_user", Tier.T2, "writeModeRequested", "writeModeApprovedBy", "writeModeApprovedAt", "writeModeApprovalHash"),
-               section("lastRun", "Last run", "history", Tier.T2, "lastRunAt", "lastRunStatus", "lastRunError"));
-         }
-         case AssistantScheduledRun.TABLE_NAME ->
-         {
-            link(table, "taskId", AssistantScheduledTask.TABLE_NAME, "Task");
-            link(table, "conversationId", AssistantConversation.TABLE_NAME, "Conversation");
-            link(table, "turnId", AssistantTurn.TABLE_NAME, "Turn");
-            help(table, "costMicros", MICROS_HELP);
-            sections(table,
-               section("run", "Run", "history", Tier.T1, "id", "taskId", "userId", "status", "scheduledFor", "startedAt", "endedAt"),
-               section("result", "Result", "chat", Tier.T2, "conversationId", "turnId", "summary", "costMicros", "error"));
-         }
          case AssistantBudget.TABLE_NAME -> budget(table);
          case AssistantBudgetOverride.TABLE_NAME, AssistantBudgetEvent.TABLE_NAME ->
          {
@@ -243,11 +213,6 @@ public final class AssistantRecordScreens
     *******************************************************************************/
    public static void addConversationChildLists(QInstance qInstance)
    {
-      QTableMetaData scheduledTask = qInstance.getTable(AssistantScheduledTask.TABLE_NAME);
-      if(scheduledTask != null)
-      {
-         childList(qInstance, scheduledTask, AssistantScheduledRun.TABLE_NAME, "Runs", "history", List.of("startedAt", "status", "conversationId", "costMicros", "summary"), "taskId", "scheduled");
-      }
       QTableMetaData conversation = qInstance.getTable(AssistantConversation.TABLE_NAME);
       if(conversation == null)
       {

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/metadata/AssistantScheduledTaskCustomizer.java

@@ -1,132 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.metadata;
-
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import com.kingsrook.qbits.assistant.AssistantRuntime;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledTask;
-import com.kingsrook.qbits.assistant.persistence.AssistantStore;
-import com.kingsrook.qbits.assistant.scheduled.ScheduledTasks;
-import com.kingsrook.qqq.backend.core.actions.customizers.TableCustomizerInterface;
-import com.kingsrook.qqq.backend.core.context.QContext;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.actions.AbstractActionInput;
-import com.kingsrook.qqq.backend.core.model.actions.tables.QueryOrGetInputInterface;
-import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
-import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.statusmessages.BadInputStatusMessage;
-
-
-/*******************************************************************************
- ** Validate task edits and invalidate approvals before changed text is saved.
- *******************************************************************************/
-public class AssistantScheduledTaskCustomizer implements TableCustomizerInterface
-{
-   /*******************************************************************************
-    ** Internal status writes bypass this customizer only inside AssistantStore.
-    *******************************************************************************/
-   @Override
-   public List<QRecord> preInsertOrUpdate(AbstractActionInput input, List<QRecord> records, boolean isPreview, Optional<List<QRecord>> oldRecordList) throws QException
-   {
-      Optional<Map<Serializable, QRecord>> old = oldRecordListToMap("id", oldRecordList);
-      AssistantRuntime runtime = AssistantRuntime.of(QContext.getQInstance());
-      for(QRecord record : records)
-      {
-         record.getValues().remove("credentialStatus");
-         if(input instanceof UpdateInput update
-            && update.hasFlag(AssistantStore.ScheduledWrite.INTERNAL))
-         {
-            continue;
-         }
-         QRecord previous = old.map(rows -> rows.get(record.getValue("id"))).orElse(null);
-         for(String field : List.of("writeModeApprovedBy", "writeModeApprovedAt", "writeModeApprovalHash", "nextRunAt", "lastRunAt", "lastRunStatus", "lastRunError"))
-         {
-            record.getValues().remove(field);
-         }
-         QRecord merged = new QRecord();
-         merged.setValues(previous == null ? new LinkedHashMap<>() : new LinkedHashMap<>(previous.getValues()));
-         record.getValues().forEach(merged::setValue);
-         for(var entry : Map.<String, Serializable>of("enabled", false, "timezone", "UTC", "outputMode", "RECORD", "writeModeRequested", false).entrySet())
-         {
-            if(merged.getValue(entry.getKey()) == null)
-            {
-               merged.setValue(entry.getKey(), entry.getValue());
-               record.setValue(entry.getKey(), entry.getValue());
-            }
-         }
-         if(previous == null || ScheduledTasks.APPROVAL_FIELDS.stream().anyMatch(field -> !Objects.equals(previous.getValue(field), merged.getValue(field))))
-         {
-            record.setValue("writeModeApprovedBy", null);
-            record.setValue("writeModeApprovedAt", null);
-            record.setValue("writeModeApprovalHash", null);
-         }
-         try
-         {
-            AssistantScheduledTask task = new AssistantScheduledTask(merged);
-            ScheduledTasks.checkReference(runtime.getConfig(), task.getCredentialEnvName());
-            if(task.getPrompt() == null || task.getPrompt().isBlank() || task.getPrompt().length() > 4000)
-            {
-               throw (new QException("The prompt must contain 1 to 4000 characters."));
-            }
-            if(!List.of("RECORD", "NOTIFICATION", "BOTH").contains(task.getOutputMode()))
-            {
-               throw (new QException("Output mode must be RECORD, NOTIFICATION or BOTH."));
-            }
-            if(task.getMaxCostUsdPerRun() != null && task.getMaxCostUsdPerRun().signum() < 0)
-            {
-               throw (new QException("The per-run cost cap cannot be negative."));
-            }
-            var next = ScheduledTasks.next(task, runtime.getClock().instant());
-            if(previous == null || List.of("enabled", "cronExpression", "timezone").stream().anyMatch(field -> !Objects.equals(previous.getValue(field), merged.getValue(field))))
-            {
-               record.setValue("nextRunAt", Boolean.TRUE.equals(task.getEnabled()) ? next : null);
-            }
-         }
-         catch(QException e)
-         {
-            record.addError(new BadInputStatusMessage(e.getMessage()));
-         }
-      }
-      return (records);
-   }
-
-
-
-   /*******************************************************************************
-    ** Computed status is never persisted.
-    *******************************************************************************/
-   @Override
-   public List<QRecord> postQuery(QueryOrGetInputInterface input, List<QRecord> records) throws QException
-   {
-      AssistantRuntime runtime = AssistantRuntime.of(QContext.getQInstance());
-      for(QRecord record : records)
-      {
-         record.setValue("credentialStatus", ScheduledTasks.credentialStatus(runtime.getConfig(), new AssistantScheduledTask(record)));
-      }
-      return (records);
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/metadata/AssistantSettingsPossibleValueProvider.java

@@ -26,7 +26,7 @@ import com.kingsrook.qbits.assistant.AssistantRuntime;
 import com.kingsrook.qbits.assistant.model.AssistantModel;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
 import com.kingsrook.qbits.assistant.persistence.AssistantStore;
-import com.kingsrook.qbits.assistant.spi.AssistantProviderType;
+import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
 import com.kingsrook.qqq.backend.core.actions.values.QCustomPossibleValueProvider;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantBudgetOverride.java

@@ -47,7 +47,7 @@ public class AssistantBudgetOverride extends QRecordEntity
    @QField()
    private Instant unlimitedUntil;
 
-   @QField(isRequired = true)
+   @QField(isRequired = true, maxLength = 1000)
    private String reason;
 
    @QField(isEditable = false, maxLength = 200)

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantConversation.java

@@ -38,12 +38,6 @@ public class AssistantConversation extends QRecordEntity
    @Deprecated(since = "0.1.0-RC.3")
    public static final String LEGACY_TABLE_NAME = "assistantConversation";
 
-   @QField(isEditable = false)
-   private Integer scheduledTaskId;
-
-   @QField(isEditable = false, maxLength = 64)
-   private String channel = "panel";
-
    @QField(isEditable = false, maxLength = 16)
    private String maxClassification;
 
@@ -541,66 +535,4 @@ public class AssistantConversation extends QRecordEntity
 
 
 
-
-
-
-   /*******************************************************************************
-    ** Getter for scheduledTaskId
-    *******************************************************************************/
-   public Integer getScheduledTaskId()
-   {
-      return (scheduledTaskId);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for scheduledTaskId
-    *******************************************************************************/
-   public void setScheduledTaskId(Integer scheduledTaskId)
-   {
-      this.scheduledTaskId = scheduledTaskId;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for scheduledTaskId
-    *******************************************************************************/
-   public AssistantConversation withScheduledTaskId(Integer scheduledTaskId)
-   {
-      this.scheduledTaskId = scheduledTaskId;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for channel
-    *******************************************************************************/
-   public String getChannel()
-   {
-      return (channel);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for channel
-    *******************************************************************************/
-   public void setChannel(String channel)
-   {
-      this.channel = channel;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for channel
-    *******************************************************************************/
-   public AssistantConversation withChannel(String channel)
-   {
-      this.channel = channel;
-      return (this);
-   }
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantDataAudit.java

@@ -66,7 +66,7 @@ public class AssistantDataAudit extends QRecordEntity
    @QField(isEditable = false, maxLength = 16)
    private String decision;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 1000)
    private String reason;
 
    @QField(isEditable = false)

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantFeedback.java

@@ -22,6 +22,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.data.QField;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 import com.kingsrook.qqq.backend.core.model.data.QRecordEntity;
+import com.kingsrook.qqq.backend.core.model.metadata.fields.ValueTooLongBehavior;
 
 
 /*******************************************************************************
@@ -52,7 +53,7 @@ public class AssistantFeedback extends QRecordEntity
    @QField(isEditable = false)
    private Integer rating;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 64, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS)
    private String reason;
 
    @QField(isEditable = false)

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantPendingAction.java

@@ -22,6 +22,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.data.QField;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 import com.kingsrook.qqq.backend.core.model.data.QRecordEntity;
+import com.kingsrook.qqq.backend.core.model.metadata.fields.ValueTooLongBehavior;
 
 
 /*******************************************************************************
@@ -48,7 +49,7 @@ public class AssistantPendingAction extends QRecordEntity
    @QField(isEditable = false, maxLength = 255)
    private String userId;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 128)
    private String toolCallId;
 
    @QField(isEditable = false, maxLength = 64)
@@ -66,7 +67,7 @@ public class AssistantPendingAction extends QRecordEntity
    @QField(isEditable = false)
    private String paramsJson;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 500, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS)
    private String summary;
 
    @QField(isEditable = false, maxLength = 16)
@@ -75,7 +76,7 @@ public class AssistantPendingAction extends QRecordEntity
    @QField(isEditable = false)
    private Integer httpStatus;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 500, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS)
    private String resultSummary;
 
    @QField(isEditable = false)

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantScheduledRun.java

@@ -1,532 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.model;
-
-
-import java.time.Instant;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.data.QField;
-import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.data.QRecordEntity;
-
-
-/*******************************************************************************
- ** Scheduled assistant bookkeeping; credentials are references only.
- *******************************************************************************/
-public class AssistantScheduledRun extends QRecordEntity
-{
-   public static final String TABLE_NAME = "assistant_scheduled_run";
-
-   @QField(isEditable = false, isPrimaryKey = true)
-   private Integer id;
-
-   @QField(isRequired = true)
-   private Integer taskId;
-
-   @QField(isRequired = true, maxLength = 200)
-   private String userId;
-
-   @QField()
-   private Instant scheduledFor;
-
-   @QField()
-   private Instant startedAt;
-
-   @QField()
-   private Instant endedAt;
-
-   @QField(maxLength = 20)
-   private String status;
-
-   @QField()
-   private Integer conversationId;
-
-   @QField()
-   private Integer turnId;
-
-   @QField()
-   private String summary;
-
-   @QField()
-   private Long costMicros;
-
-   @QField()
-   private String error;
-
-   @QField(isEditable = false)
-   private Instant createDate;
-
-   @QField(isEditable = false)
-   private Instant modifyDate;
-
-
-
-   /*******************************************************************************
-    ** Empty entity for framework mapping.
-    *******************************************************************************/
-   public AssistantScheduledRun()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** Map a bookkeeping record.
-    *******************************************************************************/
-   public AssistantScheduledRun(QRecord record) throws QException
-   {
-      populateFromQRecord(record);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for id
-    *******************************************************************************/
-   public Integer getId()
-   {
-      return (id);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for id
-    *******************************************************************************/
-   public void setId(Integer id)
-   {
-      this.id = id;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for id
-    *******************************************************************************/
-   public AssistantScheduledRun withId(Integer id)
-   {
-      this.id = id;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for taskId
-    *******************************************************************************/
-   public Integer getTaskId()
-   {
-      return (taskId);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for taskId
-    *******************************************************************************/
-   public void setTaskId(Integer taskId)
-   {
-      this.taskId = taskId;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for taskId
-    *******************************************************************************/
-   public AssistantScheduledRun withTaskId(Integer taskId)
-   {
-      this.taskId = taskId;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for userId
-    *******************************************************************************/
-   public String getUserId()
-   {
-      return (userId);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for userId
-    *******************************************************************************/
-   public void setUserId(String userId)
-   {
-      this.userId = userId;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for userId
-    *******************************************************************************/
-   public AssistantScheduledRun withUserId(String userId)
-   {
-      this.userId = userId;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for scheduledFor
-    *******************************************************************************/
-   public Instant getScheduledFor()
-   {
-      return (scheduledFor);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for scheduledFor
-    *******************************************************************************/
-   public void setScheduledFor(Instant scheduledFor)
-   {
-      this.scheduledFor = scheduledFor;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for scheduledFor
-    *******************************************************************************/
-   public AssistantScheduledRun withScheduledFor(Instant scheduledFor)
-   {
-      this.scheduledFor = scheduledFor;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for startedAt
-    *******************************************************************************/
-   public Instant getStartedAt()
-   {
-      return (startedAt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for startedAt
-    *******************************************************************************/
-   public void setStartedAt(Instant startedAt)
-   {
-      this.startedAt = startedAt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for startedAt
-    *******************************************************************************/
-   public AssistantScheduledRun withStartedAt(Instant startedAt)
-   {
-      this.startedAt = startedAt;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for endedAt
-    *******************************************************************************/
-   public Instant getEndedAt()
-   {
-      return (endedAt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for endedAt
-    *******************************************************************************/
-   public void setEndedAt(Instant endedAt)
-   {
-      this.endedAt = endedAt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for endedAt
-    *******************************************************************************/
-   public AssistantScheduledRun withEndedAt(Instant endedAt)
-   {
-      this.endedAt = endedAt;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for status
-    *******************************************************************************/
-   public String getStatus()
-   {
-      return (status);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for status
-    *******************************************************************************/
-   public void setStatus(String status)
-   {
-      this.status = status;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for status
-    *******************************************************************************/
-   public AssistantScheduledRun withStatus(String status)
-   {
-      this.status = status;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for conversationId
-    *******************************************************************************/
-   public Integer getConversationId()
-   {
-      return (conversationId);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for conversationId
-    *******************************************************************************/
-   public void setConversationId(Integer conversationId)
-   {
-      this.conversationId = conversationId;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for conversationId
-    *******************************************************************************/
-   public AssistantScheduledRun withConversationId(Integer conversationId)
-   {
-      this.conversationId = conversationId;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for turnId
-    *******************************************************************************/
-   public Integer getTurnId()
-   {
-      return (turnId);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for turnId
-    *******************************************************************************/
-   public void setTurnId(Integer turnId)
-   {
-      this.turnId = turnId;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for turnId
-    *******************************************************************************/
-   public AssistantScheduledRun withTurnId(Integer turnId)
-   {
-      this.turnId = turnId;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for summary
-    *******************************************************************************/
-   public String getSummary()
-   {
-      return (summary);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for summary
-    *******************************************************************************/
-   public void setSummary(String summary)
-   {
-      this.summary = summary;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for summary
-    *******************************************************************************/
-   public AssistantScheduledRun withSummary(String summary)
-   {
-      this.summary = summary;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for costMicros
-    *******************************************************************************/
-   public Long getCostMicros()
-   {
-      return (costMicros);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for costMicros
-    *******************************************************************************/
-   public void setCostMicros(Long costMicros)
-   {
-      this.costMicros = costMicros;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for costMicros
-    *******************************************************************************/
-   public AssistantScheduledRun withCostMicros(Long costMicros)
-   {
-      this.costMicros = costMicros;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for error
-    *******************************************************************************/
-   public String getError()
-   {
-      return (error);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for error
-    *******************************************************************************/
-   public void setError(String error)
-   {
-      this.error = error;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for error
-    *******************************************************************************/
-   public AssistantScheduledRun withError(String error)
-   {
-      this.error = error;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for createDate
-    *******************************************************************************/
-   public Instant getCreateDate()
-   {
-      return (createDate);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for createDate
-    *******************************************************************************/
-   public void setCreateDate(Instant createDate)
-   {
-      this.createDate = createDate;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for createDate
-    *******************************************************************************/
-   public AssistantScheduledRun withCreateDate(Instant createDate)
-   {
-      this.createDate = createDate;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for modifyDate
-    *******************************************************************************/
-   public Instant getModifyDate()
-   {
-      return (modifyDate);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for modifyDate
-    *******************************************************************************/
-   public void setModifyDate(Instant modifyDate)
-   {
-      this.modifyDate = modifyDate;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for modifyDate
-    *******************************************************************************/
-   public AssistantScheduledRun withModifyDate(Instant modifyDate)
-   {
-      this.modifyDate = modifyDate;
-      return (this);
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantScheduledTask.java

@@ -1,805 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.model;
-
-
-import java.math.BigDecimal;
-import java.time.Instant;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.data.QField;
-import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.data.QRecordEntity;
-
-
-/*******************************************************************************
- ** Scheduled assistant bookkeeping; credentials are references only.
- *******************************************************************************/
-public class AssistantScheduledTask extends QRecordEntity
-{
-   public static final String TABLE_NAME = "assistant_scheduled_task";
-
-   @QField(isEditable = false, isPrimaryKey = true)
-   private Integer id;
-
-   @QField(isRequired = true, maxLength = 200)
-   private String name;
-
-   @QField()
-   private Boolean enabled;
-
-   @QField(isRequired = true, maxLength = 4000)
-   private String prompt;
-
-   @QField(isRequired = true, maxLength = 200)
-   private String runAsUserId;
-
-   @QField(isRequired = true, maxLength = 200)
-   private String credentialEnvName;
-
-   @QField(isEditable = false, maxLength = 200)
-   private String credentialStatus;
-
-   @QField()
-   private Integer profileId;
-
-   @QField(isRequired = true, maxLength = 200)
-   private String cronExpression;
-
-   @QField(maxLength = 100)
-   private String timezone;
-
-   @QField(isEditable = false)
-   private Instant nextRunAt;
-
-   @QField(maxLength = 20)
-   private String outputMode;
-
-   @QField()
-   private Boolean writeModeRequested;
-
-   @QField(isEditable = false, maxLength = 200)
-   private String writeModeApprovedBy;
-
-   @QField(isEditable = false)
-   private Instant writeModeApprovedAt;
-
-   @QField(isEditable = false, maxLength = 64)
-   private String writeModeApprovalHash;
-
-   @QField()
-   private BigDecimal maxCostUsdPerRun;
-
-   @QField(isEditable = false)
-   private Instant lastRunAt;
-
-   @QField(isEditable = false, maxLength = 20)
-   private String lastRunStatus;
-
-   @QField(isEditable = false, maxLength = 500)
-   private String lastRunError;
-
-   @QField(isEditable = false)
-   private Instant createDate;
-
-   @QField(isEditable = false)
-   private Instant modifyDate;
-
-
-
-   /*******************************************************************************
-    ** Empty entity for framework mapping.
-    *******************************************************************************/
-   public AssistantScheduledTask()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** Map a bookkeeping record.
-    *******************************************************************************/
-   public AssistantScheduledTask(QRecord record) throws QException
-   {
-      populateFromQRecord(record);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for id
-    *******************************************************************************/
-   public Integer getId()
-   {
-      return (id);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for id
-    *******************************************************************************/
-   public void setId(Integer id)
-   {
-      this.id = id;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for id
-    *******************************************************************************/
-   public AssistantScheduledTask withId(Integer id)
-   {
-      this.id = id;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for name
-    *******************************************************************************/
-   public String getName()
-   {
-      return (name);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for name
-    *******************************************************************************/
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for name
-    *******************************************************************************/
-   public AssistantScheduledTask withName(String name)
-   {
-      this.name = name;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for enabled
-    *******************************************************************************/
-   public Boolean getEnabled()
-   {
-      return (enabled);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for enabled
-    *******************************************************************************/
-   public void setEnabled(Boolean enabled)
-   {
-      this.enabled = enabled;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for enabled
-    *******************************************************************************/
-   public AssistantScheduledTask withEnabled(Boolean enabled)
-   {
-      this.enabled = enabled;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for prompt
-    *******************************************************************************/
-   public String getPrompt()
-   {
-      return (prompt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for prompt
-    *******************************************************************************/
-   public void setPrompt(String prompt)
-   {
-      this.prompt = prompt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for prompt
-    *******************************************************************************/
-   public AssistantScheduledTask withPrompt(String prompt)
-   {
-      this.prompt = prompt;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for runAsUserId
-    *******************************************************************************/
-   public String getRunAsUserId()
-   {
-      return (runAsUserId);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for runAsUserId
-    *******************************************************************************/
-   public void setRunAsUserId(String runAsUserId)
-   {
-      this.runAsUserId = runAsUserId;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for runAsUserId
-    *******************************************************************************/
-   public AssistantScheduledTask withRunAsUserId(String runAsUserId)
-   {
-      this.runAsUserId = runAsUserId;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for credentialEnvName
-    *******************************************************************************/
-   public String getCredentialEnvName()
-   {
-      return (credentialEnvName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for credentialEnvName
-    *******************************************************************************/
-   public void setCredentialEnvName(String credentialEnvName)
-   {
-      this.credentialEnvName = credentialEnvName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for credentialEnvName
-    *******************************************************************************/
-   public AssistantScheduledTask withCredentialEnvName(String credentialEnvName)
-   {
-      this.credentialEnvName = credentialEnvName;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for credentialStatus
-    *******************************************************************************/
-   public String getCredentialStatus()
-   {
-      return (credentialStatus);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for credentialStatus
-    *******************************************************************************/
-   public void setCredentialStatus(String credentialStatus)
-   {
-      this.credentialStatus = credentialStatus;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for credentialStatus
-    *******************************************************************************/
-   public AssistantScheduledTask withCredentialStatus(String credentialStatus)
-   {
-      this.credentialStatus = credentialStatus;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for profileId
-    *******************************************************************************/
-   public Integer getProfileId()
-   {
-      return (profileId);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for profileId
-    *******************************************************************************/
-   public void setProfileId(Integer profileId)
-   {
-      this.profileId = profileId;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for profileId
-    *******************************************************************************/
-   public AssistantScheduledTask withProfileId(Integer profileId)
-   {
-      this.profileId = profileId;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for cronExpression
-    *******************************************************************************/
-   public String getCronExpression()
-   {
-      return (cronExpression);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for cronExpression
-    *******************************************************************************/
-   public void setCronExpression(String cronExpression)
-   {
-      this.cronExpression = cronExpression;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for cronExpression
-    *******************************************************************************/
-   public AssistantScheduledTask withCronExpression(String cronExpression)
-   {
-      this.cronExpression = cronExpression;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for timezone
-    *******************************************************************************/
-   public String getTimezone()
-   {
-      return (timezone);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for timezone
-    *******************************************************************************/
-   public void setTimezone(String timezone)
-   {
-      this.timezone = timezone;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for timezone
-    *******************************************************************************/
-   public AssistantScheduledTask withTimezone(String timezone)
-   {
-      this.timezone = timezone;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for nextRunAt
-    *******************************************************************************/
-   public Instant getNextRunAt()
-   {
-      return (nextRunAt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for nextRunAt
-    *******************************************************************************/
-   public void setNextRunAt(Instant nextRunAt)
-   {
-      this.nextRunAt = nextRunAt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for nextRunAt
-    *******************************************************************************/
-   public AssistantScheduledTask withNextRunAt(Instant nextRunAt)
-   {
-      this.nextRunAt = nextRunAt;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for outputMode
-    *******************************************************************************/
-   public String getOutputMode()
-   {
-      return (outputMode);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for outputMode
-    *******************************************************************************/
-   public void setOutputMode(String outputMode)
-   {
-      this.outputMode = outputMode;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for outputMode
-    *******************************************************************************/
-   public AssistantScheduledTask withOutputMode(String outputMode)
-   {
-      this.outputMode = outputMode;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for writeModeRequested
-    *******************************************************************************/
-   public Boolean getWriteModeRequested()
-   {
-      return (writeModeRequested);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for writeModeRequested
-    *******************************************************************************/
-   public void setWriteModeRequested(Boolean writeModeRequested)
-   {
-      this.writeModeRequested = writeModeRequested;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for writeModeRequested
-    *******************************************************************************/
-   public AssistantScheduledTask withWriteModeRequested(Boolean writeModeRequested)
-   {
-      this.writeModeRequested = writeModeRequested;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for writeModeApprovedBy
-    *******************************************************************************/
-   public String getWriteModeApprovedBy()
-   {
-      return (writeModeApprovedBy);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for writeModeApprovedBy
-    *******************************************************************************/
-   public void setWriteModeApprovedBy(String writeModeApprovedBy)
-   {
-      this.writeModeApprovedBy = writeModeApprovedBy;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for writeModeApprovedBy
-    *******************************************************************************/
-   public AssistantScheduledTask withWriteModeApprovedBy(String writeModeApprovedBy)
-   {
-      this.writeModeApprovedBy = writeModeApprovedBy;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for writeModeApprovedAt
-    *******************************************************************************/
-   public Instant getWriteModeApprovedAt()
-   {
-      return (writeModeApprovedAt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for writeModeApprovedAt
-    *******************************************************************************/
-   public void setWriteModeApprovedAt(Instant writeModeApprovedAt)
-   {
-      this.writeModeApprovedAt = writeModeApprovedAt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for writeModeApprovedAt
-    *******************************************************************************/
-   public AssistantScheduledTask withWriteModeApprovedAt(Instant writeModeApprovedAt)
-   {
-      this.writeModeApprovedAt = writeModeApprovedAt;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for writeModeApprovalHash
-    *******************************************************************************/
-   public String getWriteModeApprovalHash()
-   {
-      return (writeModeApprovalHash);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for writeModeApprovalHash
-    *******************************************************************************/
-   public void setWriteModeApprovalHash(String writeModeApprovalHash)
-   {
-      this.writeModeApprovalHash = writeModeApprovalHash;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for writeModeApprovalHash
-    *******************************************************************************/
-   public AssistantScheduledTask withWriteModeApprovalHash(String writeModeApprovalHash)
-   {
-      this.writeModeApprovalHash = writeModeApprovalHash;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for maxCostUsdPerRun
-    *******************************************************************************/
-   public BigDecimal getMaxCostUsdPerRun()
-   {
-      return (maxCostUsdPerRun);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for maxCostUsdPerRun
-    *******************************************************************************/
-   public void setMaxCostUsdPerRun(BigDecimal maxCostUsdPerRun)
-   {
-      this.maxCostUsdPerRun = maxCostUsdPerRun;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for maxCostUsdPerRun
-    *******************************************************************************/
-   public AssistantScheduledTask withMaxCostUsdPerRun(BigDecimal maxCostUsdPerRun)
-   {
-      this.maxCostUsdPerRun = maxCostUsdPerRun;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for lastRunAt
-    *******************************************************************************/
-   public Instant getLastRunAt()
-   {
-      return (lastRunAt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for lastRunAt
-    *******************************************************************************/
-   public void setLastRunAt(Instant lastRunAt)
-   {
-      this.lastRunAt = lastRunAt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for lastRunAt
-    *******************************************************************************/
-   public AssistantScheduledTask withLastRunAt(Instant lastRunAt)
-   {
-      this.lastRunAt = lastRunAt;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for lastRunStatus
-    *******************************************************************************/
-   public String getLastRunStatus()
-   {
-      return (lastRunStatus);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for lastRunStatus
-    *******************************************************************************/
-   public void setLastRunStatus(String lastRunStatus)
-   {
-      this.lastRunStatus = lastRunStatus;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for lastRunStatus
-    *******************************************************************************/
-   public AssistantScheduledTask withLastRunStatus(String lastRunStatus)
-   {
-      this.lastRunStatus = lastRunStatus;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for lastRunError
-    *******************************************************************************/
-   public String getLastRunError()
-   {
-      return (lastRunError);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for lastRunError
-    *******************************************************************************/
-   public void setLastRunError(String lastRunError)
-   {
-      this.lastRunError = lastRunError;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for lastRunError
-    *******************************************************************************/
-   public AssistantScheduledTask withLastRunError(String lastRunError)
-   {
-      this.lastRunError = lastRunError;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for createDate
-    *******************************************************************************/
-   public Instant getCreateDate()
-   {
-      return (createDate);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for createDate
-    *******************************************************************************/
-   public void setCreateDate(Instant createDate)
-   {
-      this.createDate = createDate;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for createDate
-    *******************************************************************************/
-   public AssistantScheduledTask withCreateDate(Instant createDate)
-   {
-      this.createDate = createDate;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for modifyDate
-    *******************************************************************************/
-   public Instant getModifyDate()
-   {
-      return (modifyDate);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for modifyDate
-    *******************************************************************************/
-   public void setModifyDate(Instant modifyDate)
-   {
-      this.modifyDate = modifyDate;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for modifyDate
-    *******************************************************************************/
-   public AssistantScheduledTask withModifyDate(Instant modifyDate)
-   {
-      this.modifyDate = modifyDate;
-      return (this);
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantToolCall.java

@@ -40,9 +40,6 @@ public class AssistantToolCall extends QRecordEntity
    @Deprecated(since = "0.1.0-RC.3")
    public static final String LEGACY_TABLE_NAME = "assistantToolCall";
 
-   @QField(isEditable = false, maxLength = 64)
-   private String clientChannel;
-
    @QField(isEditable = false, isPrimaryKey = true)
    private Integer id;
 
@@ -55,7 +52,7 @@ public class AssistantToolCall extends QRecordEntity
    @QField(isEditable = false, maxLength = 255)
    private String userId;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 128)
    private String toolCallId;
 
    @QField(isEditable = false, maxLength = 64)
@@ -85,7 +82,7 @@ public class AssistantToolCall extends QRecordEntity
    @QField(isEditable = false)
    private Long durationMs;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 500, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS)
    private String resultSummary;
 
    @QField(isEditable = false)
@@ -100,7 +97,7 @@ public class AssistantToolCall extends QRecordEntity
    @QField(isEditable = false)
    private Integer httpStatus;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 500)
    private String auditHref;
 
    @QField(isEditable = false, possibleValueSourceName = AssistantPendingAction.TABLE_NAME)
@@ -806,35 +803,4 @@ public class AssistantToolCall extends QRecordEntity
       return (this);
    }
 
-
-
-
-   /*******************************************************************************
-    ** Getter for clientChannel
-    *******************************************************************************/
-   public String getClientChannel()
-   {
-      return (clientChannel);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for clientChannel
-    *******************************************************************************/
-   public void setClientChannel(String clientChannel)
-   {
-      this.clientChannel = clientChannel;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for clientChannel
-    *******************************************************************************/
-   public AssistantToolCall withClientChannel(String clientChannel)
-   {
-      this.clientChannel = clientChannel;
-      return (this);
-   }
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantTurn.java

@@ -74,7 +74,7 @@ public class AssistantTurn extends QRecordEntity
    @QField(isEditable = false, maxLength = 16)
    private String status;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 64)
    private String stopReason;
 
    @QField(isEditable = false, maxLength = 32)
@@ -92,21 +92,6 @@ public class AssistantTurn extends QRecordEntity
    @QField(isEditable = false)
    private Instant endedAt;
 
-   @QField(isEditable = false)
-   private Instant heartbeatAt;
-
-   @QField(isEditable = false, maxLength = 100)
-   private String leaseOwner;
-
-   @QField(isEditable = false)
-   private Instant cancelRequestedAt;
-
-   @QField(isEditable = false, maxLength = 64)
-   private String phase;
-
-   @QField(isEditable = false, maxLength = 16)
-   private String concurrencyMode;
-
    @QField(isEditable = false)
    private Integer toolCallCount;
 
@@ -1026,160 +1011,4 @@ public class AssistantTurn extends QRecordEntity
       this.providerId = providerId;
       return (this);
    }
-
-
-
-   /*******************************************************************************
-    ** Getter for heartbeatAt
-    *******************************************************************************/
-   public Instant getHeartbeatAt()
-   {
-      return (this.heartbeatAt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for heartbeatAt
-    *******************************************************************************/
-   public void setHeartbeatAt(Instant heartbeatAt)
-   {
-      this.heartbeatAt = heartbeatAt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for heartbeatAt
-    *******************************************************************************/
-   public AssistantTurn withHeartbeatAt(Instant heartbeatAt)
-   {
-      this.heartbeatAt = heartbeatAt;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for leaseOwner
-    *******************************************************************************/
-   public String getLeaseOwner()
-   {
-      return (this.leaseOwner);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for leaseOwner
-    *******************************************************************************/
-   public void setLeaseOwner(String leaseOwner)
-   {
-      this.leaseOwner = leaseOwner;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for leaseOwner
-    *******************************************************************************/
-   public AssistantTurn withLeaseOwner(String leaseOwner)
-   {
-      this.leaseOwner = leaseOwner;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for cancelRequestedAt
-    *******************************************************************************/
-   public Instant getCancelRequestedAt()
-   {
-      return (this.cancelRequestedAt);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for cancelRequestedAt
-    *******************************************************************************/
-   public void setCancelRequestedAt(Instant cancelRequestedAt)
-   {
-      this.cancelRequestedAt = cancelRequestedAt;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for cancelRequestedAt
-    *******************************************************************************/
-   public AssistantTurn withCancelRequestedAt(Instant cancelRequestedAt)
-   {
-      this.cancelRequestedAt = cancelRequestedAt;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for phase
-    *******************************************************************************/
-   public String getPhase()
-   {
-      return (this.phase);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for phase
-    *******************************************************************************/
-   public void setPhase(String phase)
-   {
-      this.phase = phase;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for phase
-    *******************************************************************************/
-   public AssistantTurn withPhase(String phase)
-   {
-      this.phase = phase;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for concurrencyMode
-    *******************************************************************************/
-   public String getConcurrencyMode()
-   {
-      return (this.concurrencyMode);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for concurrencyMode
-    *******************************************************************************/
-   public void setConcurrencyMode(String concurrencyMode)
-   {
-      this.concurrencyMode = concurrencyMode;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for concurrencyMode
-    *******************************************************************************/
-   public AssistantTurn withConcurrencyMode(String concurrencyMode)
-   {
-      this.concurrencyMode = concurrencyMode;
-      return (this);
-   }
-
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/model/AssistantUsage.java

@@ -84,7 +84,7 @@ public class AssistantUsage extends QRecordEntity
    @QField(isEditable = false)
    private Long costMicros;
 
-   @QField(isEditable = false)
+   @QField(isEditable = false, maxLength = 100)
    private String requestId;
 
    @QField(isEditable = false)

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/persistence/AssistantStore.java

@@ -17,21 +17,8 @@
 package com.kingsrook.qbits.assistant.persistence;
 
 
-import java.io.Serializable;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
 import com.kingsrook.qbits.assistant.AssistantQBitConfig;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
-import com.kingsrook.qbits.assistant.classification.Classifications;
-import com.kingsrook.qbits.assistant.engine.TurnClassification;
-import com.kingsrook.qbits.assistant.engine.TurnEvent;
 import com.kingsrook.qbits.assistant.model.AssistantBudget;
 import com.kingsrook.qbits.assistant.model.AssistantBudgetEvent;
 import com.kingsrook.qbits.assistant.model.AssistantBudgetOverride;
@@ -45,22 +32,18 @@ import com.kingsrook.qbits.assistant.model.AssistantModelPrice;
 import com.kingsrook.qbits.assistant.model.AssistantPendingAction;
 import com.kingsrook.qbits.assistant.model.AssistantPolicy;
 import com.kingsrook.qbits.assistant.model.AssistantProvider;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledRun;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledTask;
 import com.kingsrook.qbits.assistant.model.AssistantToolCall;
 import com.kingsrook.qbits.assistant.model.AssistantTurn;
 import com.kingsrook.qbits.assistant.model.AssistantTurnEvent;
 import com.kingsrook.qbits.assistant.model.AssistantUsage;
 import com.kingsrook.qbits.assistant.model.AssistantUsageDaily;
-import com.kingsrook.qbits.assistant.scheduled.ScheduledTasks;
-import com.kingsrook.qbits.assistant.spi.ModelUsage;
+import com.kingsrook.qbits.assistant.provider.ModelUsage;
 import com.kingsrook.qqq.backend.core.actions.tables.DeleteAction;
 import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
 import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
 import com.kingsrook.qqq.backend.core.actions.tables.UpdateAction;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.actions.tables.ActionFlag;
 import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput;
@@ -73,6 +56,15 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateOutput;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 import com.kingsrook.qqq.backend.core.model.data.QRecordEntity;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
+import java.io.Serializable;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 
 /*******************************************************************************
@@ -162,13 +154,7 @@ public class AssistantStore
       {
          projectBudgetUsage(record);
       }
-      rememberTranscript(entity.tableName(), entity.toQRecord(), record.getValue("id"));
-      QRecord returned = cryptRecord(entity.tableName(), record, false);
-      if(TranscriptRedactor.current() != null)
-      {
-         TranscriptRedactor.current().restore(returned, entity.toQRecord());
-      }
-      return ((T) QRecordEntity.fromQRecord(entity.getClass(), returned));
+      return ((T) QRecordEntity.fromQRecord(entity.getClass(), cryptRecord(entity.tableName(), record, false)));
    }
 
 
@@ -179,7 +165,6 @@ public class AssistantStore
    public void update(QRecordEntity entity) throws QException
    {
       requireOwnTable(entity.tableName());
-      rememberTranscript(entity.tableName(), entity.toQRecord(), entity.toQRecord().getValue("id"));
       UpdateOutput output = new UpdateAction().execute(new UpdateInput(entity.tableName()).withRecord(cryptRecord(entity.tableName(), entity.toQRecord(), true)));
       QRecord      record = output.getRecords().get(0);
       if(CollectionUtils.nullSafeHasContents(record.getErrors()))
@@ -196,7 +181,6 @@ public class AssistantStore
    public void updateFields(String tableName, QRecord record) throws QException
    {
       requireOwnTable(tableName);
-      rememberTranscript(tableName, record, record.getValue("id"));
       UpdateOutput output = new UpdateAction().execute(new UpdateInput(tableName).withRecord(cryptRecord(tableName, record, true)));
       QRecord      result = output.getRecords().get(0);
       if(CollectionUtils.nullSafeHasContents(result.getErrors()))
@@ -393,27 +377,6 @@ public class AssistantStore
 
 
 
-   /*******************************************************************************
-    ** Re-read before a lifecycle update. A completed row is never reopened by
-    ** a late local Stop or overwritten by a second local finalizer. Every read
-    ** and update remains under the caller's own session and owner filter.
-    *******************************************************************************/
-   public boolean updateRunningTurn(String userId, QRecord changes) throws QException
-   {
-      synchronized(QContext.getQInstance())
-      {
-         AssistantTurn current = getTurn(userId, changes.getValueInteger("id"));
-         if(current == null || !("RUNNING".equals(current.getStatus()) || "CANCELLING".equals(current.getStatus())))
-         {
-            return (false);
-         }
-         updateFields(AssistantTurn.TABLE_NAME, changes);
-         return (true);
-      }
-   }
-
-
-
    /*******************************************************************************
     ** One of the user's own pending actions, or null.
     *******************************************************************************/
@@ -441,51 +404,6 @@ public class AssistantStore
     ** Persist one streamed event.
     *******************************************************************************/
    public void insertEvent(Integer turnId, String userId, int seq, String eventType, String dataJson) throws QException
-   {
-      if(TurnEvent.MESSAGE_END.equals(eventType) || TurnEvent.ERROR.equals(eventType))
-      {
-         // Serialize memory-backend callers. The Postgres partial unique index
-         // arbitrates this same race between independent replicas.
-         synchronized(QContext.getQInstance())
-         {
-            if(hasTerminalEvent(userId, turnId))
-            {
-               return;
-            }
-            try
-            {
-               insertStreamEvent(turnId, userId, seq, eventType, dataJson);
-            }
-            catch(QException e)
-            {
-               if(!hasTerminalEvent(userId, turnId))
-               {
-                  throw (e);
-               }
-            }
-         }
-         return;
-      }
-      insertStreamEvent(turnId, userId, seq, eventType, dataJson);
-   }
-
-
-
-   /*******************************************************************************
-    ** Whether a terminal replay frame has already been persisted by any owner.
-    *******************************************************************************/
-   private boolean hasTerminalEvent(String userId, Integer turnId) throws QException
-   {
-      return (!query(AssistantTurnEvent.TABLE_NAME, owned(userId).withCriteria("turnId", QCriteriaOperator.EQUALS, turnId)
-         .withCriteria("eventType", QCriteriaOperator.EQUALS, TurnEvent.MESSAGE_END).withLimit(1), AssistantTurnEvent.class).isEmpty());
-   }
-
-
-
-   /*******************************************************************************
-    ** Persist one frame through the normal encrypted, user-owned store path.
-    *******************************************************************************/
-   private void insertStreamEvent(Integer turnId, String userId, int seq, String eventType, String dataJson) throws QException
    {
       insert(new AssistantTurnEvent()
          .withTurnId(turnId)
@@ -855,7 +773,7 @@ public class AssistantStore
    /*******************************************************************************
     ** Save the turn level and never lower persisted conversation history.
     *******************************************************************************/
-   public synchronized void saveClassification(String userId, Integer conversationId, Integer turnId, TurnClassification classification) throws QException
+   public synchronized void saveClassification(String userId, Integer conversationId, Integer turnId, com.kingsrook.qbits.assistant.engine.TurnClassification classification) throws QException
    {
       AssistantConversation current = getConversation(userId, conversationId);
       classification.inherit(current);
@@ -863,8 +781,8 @@ public class AssistantStore
          .withValue("classification", classification.getClassification().name()).withValue("classificationTables", classification.getTables()));
       if(current != null)
       {
-         var maximum = Classifications.max(
-            Classifications.stored(current.getMaxClassification()), classification.getClassification());
+         var maximum = com.kingsrook.qbits.assistant.classification.DataClassification.max(
+            com.kingsrook.qbits.assistant.classification.DataClassification.stored(current.getMaxClassification()), classification.getClassification());
          if(!maximum.name().equals(current.getMaxClassification()))
          {
             updateFields(AssistantConversation.TABLE_NAME, new QRecord().withValue("id", conversationId).withValue("maxClassification", maximum.name()));
@@ -907,10 +825,6 @@ public class AssistantStore
       }
       QRecord copy = new QRecord();
       copy.setValues(new LinkedHashMap<>(record.getValues()));
-      if(encrypt && TranscriptRedactor.current() != null)
-      {
-         copy = TranscriptRedactor.current().prepare(copy);
-      }
       for(String field : ENCRYPTED_FIELDS.getOrDefault(tableName, List.of()))
       {
          if(copy.getValue(field) instanceof String text)
@@ -923,19 +837,6 @@ public class AssistantStore
 
 
 
-   /*******************************************************************************
-    ** Stage transcript payloads until all classified values of the turn are known.
-    *******************************************************************************/
-   private void rememberTranscript(String table, QRecord record, Serializable id)
-   {
-      if(TranscriptRedactor.current() != null)
-      {
-         TranscriptRedactor.current().saved(table, record, id);
-      }
-   }
-
-
-
    /*******************************************************************************
     ** Retention candidates are paged independently of deletion, so retained PHI cannot starve other rows.
     *******************************************************************************/
@@ -1033,98 +934,4 @@ public class AssistantStore
          updateFields(AssistantBudgetUsage.TABLE_NAME, projection.withValue("id", existing.get(0).getId()));
       }
    }
-
-
-
-   /*******************************************************************************
-    ** Internal bookkeeping flag; never accepted from a UI request body.
-    *******************************************************************************/
-   public enum ScheduledWrite implements ActionFlag
-   {
-      INTERNAL
-   }
-
-
-
-   /*******************************************************************************
-    ** Update computed task fields through QQQ under the caller's session.
-    *******************************************************************************/
-   public void scheduledUpdate(QRecord record) throws QException
-   {
-      UpdateOutput output = new UpdateAction().execute(new UpdateInput(AssistantScheduledTask.TABLE_NAME)
-         .withRecord(record).withFlag(ScheduledWrite.INTERNAL));
-      if(CollectionUtils.nullSafeHasContents(output.getRecords().get(0).getErrors()))
-      {
-         throw (new QException("Could not update scheduled task bookkeeping."));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Read a task definition, never application data.
-    *******************************************************************************/
-   public AssistantScheduledTask scheduledTask(Integer id) throws QException
-   {
-      return (first(query(AssistantScheduledTask.TABLE_NAME,
-         new QQueryFilter().withCriteria("id", QCriteriaOperator.EQUALS, id), AssistantScheduledTask.class)));
-   }
-
-
-
-   /*******************************************************************************
-    ** Optimistic slot claim. The database unique(taskId, scheduledFor) is the
-    ** cross-replica arbiter; the monitor also covers the fixture memory backend.
-    ** Advance before dispatch. A crash can skip a slot, never run it twice.
-    *******************************************************************************/
-   public ScheduledClaim claimScheduled(
-      AssistantScheduledTask candidate, Instant now, Boolean manual) throws QException
-   {
-      synchronized(QContext.getQInstance())
-      {
-         var task = scheduledTask(candidate.getId());
-         if(task == null || (!manual && (!Boolean.TRUE.equals(task.getEnabled()) || task.getNextRunAt() == null
-            || task.getNextRunAt().isAfter(now) || !Objects.equals(task.getNextRunAt(), candidate.getNextRunAt()))))
-         {
-            return (null);
-         }
-         Instant slot = manual ? now : task.getNextRunAt();
-         Instant next = Boolean.TRUE.equals(task.getEnabled()) ? ScheduledTasks.next(task, now) : null;
-         var filter = new QQueryFilter().withCriteria("taskId", QCriteriaOperator.EQUALS, task.getId()).withCriteria("scheduledFor", QCriteriaOperator.EQUALS, slot);
-         if(!query(AssistantScheduledRun.TABLE_NAME, filter, AssistantScheduledRun.class).isEmpty())
-         {
-            if(!manual)
-            {
-               scheduledUpdate(new QRecord().withValue("id", task.getId()).withValue("nextRunAt", next));
-            }
-            return (null);
-         }
-         AssistantScheduledRun run;
-         try
-         {
-            run = insert(new AssistantScheduledRun().withTaskId(task.getId()).withUserId(task.getRunAsUserId())
-               .withScheduledFor(slot).withStartedAt(now).withStatus("RUNNING").withCostMicros(0L));
-         }
-         catch(QException e)
-         {
-            if(!query(AssistantScheduledRun.TABLE_NAME, filter, AssistantScheduledRun.class).isEmpty())
-            {
-               return (null);
-            }
-            throw (e);
-         }
-         scheduledUpdate(new QRecord().withValue("id", task.getId()).withValue("nextRunAt", next));
-         return (new ScheduledClaim(task, run));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** The claimed task snapshot and its run owner must remain consistent.
-    *******************************************************************************/
-   public record ScheduledClaim(AssistantScheduledTask task, AssistantScheduledRun run)
-   {
-   }
-
 }

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/persistence/TranscriptRedactor.java

@@ -1,495 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.persistence;
-
-
-import java.io.Serializable;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import com.kingsrook.qbits.assistant.classification.ClassificationSource;
-import com.kingsrook.qbits.assistant.model.AssistantPendingAction;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
-import com.kingsrook.qqq.backend.core.actions.permissions.fieldaccess.ClassifiedValueTokens;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.logging.LogRedactorInterface;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
-import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
-import com.kingsrook.qqq.backend.core.utils.JsonUtils;
-
-
-/*******************************************************************************
- ** Turn-local storage egress protection. Values and provisional payloads live only
- ** in memory; QQQ actions receive placeholders until the complete turn is known.
- ** The log hook is global while active, covering provider and tool worker threads.
- *******************************************************************************/
-public class TranscriptRedactor implements LogRedactorInterface, AutoCloseable
-{
-   private static final ThreadLocal<TranscriptRedactor> CURRENT = new ThreadLocal<>();
-   private static final Set<String> PAYLOAD_FIELDS = Set.of("partsJson", "inputJson", "resultJson", "redactionsJson", "dataJson", "paramsJson",
-      "summary", "resultSummary", "reason", "title", "contextJson", "errorMessage", "errorText", "error", "requestId", "comment", "providerRequestId", "providerRequestIds", "auditHref", "toolCallId", "stopReason");
-   private final ClassificationSource classifications;
-   private final QInstance instance;
-   private final Map<String, String> replacements = new LinkedHashMap<>();
-   private final Map<List<String>, String> recordTokens = new LinkedHashMap<>();
-   private final Map<List<String>, QRecord> pending = new LinkedHashMap<>();
-   private Boolean flushing = false;
-   private volatile Boolean closed = false;
-   private volatile Boolean released = false;
-   private Integer workers = 0;
-
-
-
-   /*******************************************************************************
-    ** Register only for this turn; close releases both values and the log hook.
-    *******************************************************************************/
-   public TranscriptRedactor(QInstance instance, ClassificationSource classifications)
-   {
-      this.instance = instance;
-      this.classifications = classifications;
-      QLogger.registerRedactor(this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Explicit propagation works for pooled tool executors, without inheritable state.
-    *******************************************************************************/
-   public void attach()
-   {
-      CURRENT.set(this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Remove only the thread binding, retaining the turn's in-memory state.
-    *******************************************************************************/
-   public static void detach()
-   {
-      CURRENT.remove();
-   }
-
-
-
-   /*******************************************************************************
-    ** Storage and tools share the currently bound turn, if any.
-    *******************************************************************************/
-   public static TranscriptRedactor current()
-   {
-      return (CURRENT.get());
-   }
-
-
-
-   /*******************************************************************************
-    ** Capture the raw canonical value and the actual displayed/truncated variant.
-    ** Tokens remain bound to the original record field, including equal values.
-    *******************************************************************************/
-   public void observe(String tableName, String fieldName, Serializable primaryKey, Object value, Object displayed)
-   {
-      QTableMetaData table = instance.getTable(tableName);
-      if(released || value == null || table == null || table.getField(fieldName) == null
-         || !classifications.ofField(tableName, fieldName).isAtLeast(DataClassification.PII))
-      {
-         return;
-      }
-      Serializable original = value instanceof Serializable serializable ? serializable : String.valueOf(value);
-      String token = primaryKey == null
-         ? ClassifiedValueTokens.forContext(List.of("assistant", tableName, fieldName), original)
-         : ClassifiedValueTokens.forRecordField(table, table.getField(fieldName), primaryKey, original);
-      synchronized(this)
-      {
-         if(released)
-         {
-            return;
-         }
-         recordTokens.put(List.of(tableName, fieldName, String.valueOf(primaryKey), String.valueOf(displayed)), token);
-         remember(ClassifiedValueTokens.canonical(original), token);
-         remember(String.valueOf(value), token);
-         if(displayed != null)
-         {
-            remember(String.valueOf(displayed), token);
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** A snippet is another spelling of an already observed field, not a new value.
-    *******************************************************************************/
-   public synchronized void variant(String table, String field, String primaryKey, String text)
-   {
-      if(!closed && text != null && table != null && field != null && primaryKey != null)
-      {
-         recordTokens.entrySet().stream().filter(entry -> entry.getKey().subList(0, 3).equals(List.of(table, field, primaryKey)))
-            .findFirst().ifPresent(entry -> remember(text, entry.getValue()));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Also protect JSON-escaped and URL-encoded occurrences in envelopes and links.
-    *******************************************************************************/
-   private void remember(String value, String token)
-   {
-      if(value == null || value.isEmpty())
-      {
-         return;
-      }
-      replacements.putIfAbsent(value, token);
-      String json = JsonUtils.toJson(value);
-      replacements.putIfAbsent(json.substring(1, json.length() - 1), token);
-      replacements.putIfAbsent(URLEncoder.encode(value, StandardCharsets.UTF_8), token);
-   }
-
-
-
-   /*******************************************************************************
-    ** Existing tool summaries may clip a value before storage. Remember that exact
-    ** prefix as another variant while keeping the live/model summary unchanged.
-    *******************************************************************************/
-   public synchronized void truncated(String original, String prefix)
-   {
-      for(var entry : new ArrayList<>(replacements.entrySet()))
-      {
-         int start = original.indexOf(entry.getKey());
-         while(start >= 0)
-         {
-            if(start < prefix.length() && start + entry.getKey().length() > prefix.length())
-            {
-               remember(prefix.substring(start), entry.getValue());
-            }
-            start = original.indexOf(entry.getKey(), start + 1);
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Criteria and proposed values are classified even when a query returns no rows.
-    *******************************************************************************/
-   public void input(Map<String, Object> input)
-   {
-      if(input != null && input.get("table") instanceof String table)
-      {
-         criteria(table, input.get("filter"));
-         if(input.get("values") instanceof Map<?, ?> values)
-         {
-            values.forEach((field, value) -> observe(table, String.valueOf(field), null, value, value));
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Traverse both model and QQQ filter spellings, including nested boolean groups.
-    *******************************************************************************/
-   private void criteria(String table, Object node)
-   {
-      if(node instanceof Map<?, ?> map)
-      {
-         Object field = map.containsKey("field") ? map.get("field") : map.get("fieldName");
-         if(field instanceof String name && map.get("values") instanceof List<?> values)
-         {
-            values.forEach(value -> observe(table, name, null, value, value));
-         }
-         map.values().forEach(value -> criteria(table, value));
-      }
-      else if(node instanceof List<?> list)
-      {
-         list.forEach(value -> criteria(table, value));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Longest exact match wins; a single pass never redacts a generated token again.
-    *******************************************************************************/
-   @Override
-   public synchronized String redact(String text)
-   {
-      if(text == null || replacements.isEmpty())
-      {
-         return (text);
-      }
-      List<String> values = new ArrayList<>(replacements.keySet());
-      values.sort(Comparator.comparingInt(String::length).reversed());
-      Pattern pattern = Pattern.compile("(?:hmac|shred):v1:[A-Za-z0-9._-]+:[A-Za-z0-9_-]+|changed:v1|" + String.join("|", values.stream().map(Pattern::quote).toList()));
-      Matcher matcher = pattern.matcher(text);
-      return (matcher.replaceAll(match -> Matcher.quoteReplacement(replacements.getOrDefault(match.group(), match.group()))));
-   }
-
-
-
-   /*******************************************************************************
-    ** Redact JSON leaves without damaging property names or numeric syntax. Enveloped
-    ** tool data retains its framing. Invalid/opaque content is still exact-redacted.
-    *******************************************************************************/
-   public String payload(String text)
-   {
-      if(text == null)
-      {
-         return (null);
-      }
-      int start = text.indexOf('{');
-      int end = text.lastIndexOf('}');
-      try
-      {
-         if(text.stripLeading().startsWith("["))
-         {
-            return (JsonUtils.toJson(tree(JsonUtils.toObject(text, Object.class), null, null)));
-         }
-         if(start >= 0 && end >= start)
-         {
-            Object json = JsonUtils.toObject(text.substring(start, end + 1), Object.class);
-            return (redact(text.substring(0, start)) + JsonUtils.toJson(tree(json, null, null)) + redact(text.substring(end + 1)));
-         }
-      }
-      catch(Exception e)
-      {
-         return (redact(text));
-      }
-      return (redact(text));
-   }
-
-
-
-   /*******************************************************************************
-    ** Preserve record bindings in structured query/get results and render copies.
-    *******************************************************************************/
-   private synchronized Object tree(Object node, String table, String primaryKey)
-   {
-      if(node instanceof Map<?, ?> map)
-      {
-         Object namedTable = map.containsKey("table") ? map.get("table") : map.get("tableName");
-         String resolvedTable = namedTable instanceof String name ? name : table;
-         Object id = map.containsKey("id") ? map.get("id") : map.get("recordId");
-         String resolvedKey = id == null ? primaryKey : String.valueOf(id);
-         Map<String, Object> copy = new LinkedHashMap<>();
-         map.forEach((key, value) ->
-         {
-            String token = recordTokens.get(List.of(String.valueOf(resolvedTable), String.valueOf(key), String.valueOf(resolvedKey), String.valueOf(value)));
-            copy.put(redact(String.valueOf(key)), token == null ? tree(value, resolvedTable, resolvedKey) : token);
-         });
-         return (copy);
-      }
-      if(node instanceof List<?> list)
-      {
-         return (list.stream().map(value -> tree(value, table, primaryKey)).toList());
-      }
-      if(node instanceof String text)
-      {
-         return (redact(text));
-      }
-      if(node instanceof Number && replacements.containsKey(String.valueOf(node)))
-      {
-         return (replacements.get(String.valueOf(node)));
-      }
-      return (node);
-   }
-
-
-
-   /*******************************************************************************
-    ** Never put provisional content in a backend, its audits, or its SQL logs.
-    *******************************************************************************/
-   public synchronized QRecord prepare(QRecord original)
-   {
-      QRecord copy = new QRecord();
-      copy.setValues(new LinkedHashMap<>(original.getValues()));
-      for(String field : PAYLOAD_FIELDS)
-      {
-         if(copy.getValue(field) instanceof String text)
-         {
-            copy.setValue(field, flushing && !closed ? stored(field, text) : (field.endsWith("Json") ? (field.equals("partsJson") ? "[]" : "{}") : ClassifiedValueTokens.changed()));
-         }
-      }
-      if(!flushing && copy.getValues().containsKey("paramsJson") && !AssistantPendingAction.STATUS_REJECTED.equals(copy.getValueString("status")))
-      {
-         copy.setValue("status", "PREPARING");
-      }
-      return (copy);
-   }
-
-
-
-   /*******************************************************************************
-    ** Truncate only after redaction, so a storage bound never cuts a raw value.
-    *******************************************************************************/
-   private String stored(String field, String text)
-   {
-      String safe = payload(text);
-      Integer limit = switch(field)
-      {
-         case "inputJson" -> 4000;
-         case "resultJson" -> 64000;
-         case "title" -> 60;
-         default -> null;
-      };
-      if("title".equals(field))
-      {
-         safe = safe.strip().split("\\R", 2)[0].replaceAll("\\s+", " ").strip();
-      }
-      return (limit != null && safe.length() > limit ? safe.substring(0, limit - 1) + "…" : safe);
-   }
-
-
-
-   /*******************************************************************************
-    ** Return live content to the caller without losing backend-generated defaults.
-    *******************************************************************************/
-   public void restore(QRecord returned, QRecord original)
-   {
-      for(String field : PAYLOAD_FIELDS)
-      {
-         if(original.getValues().containsKey(field))
-         {
-            returned.setValue(field, original.getValue(field));
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Remember only content columns, merging later writes without stale bookkeeping.
-    *******************************************************************************/
-   public synchronized void saved(String table, QRecord original, Serializable id)
-   {
-      if(flushing || closed || PAYLOAD_FIELDS.stream().noneMatch(original.getValues()::containsKey))
-      {
-         return;
-      }
-      QRecord content = pending.computeIfAbsent(List.of(table, String.valueOf(id)), key -> new QRecord().withValue("id", id));
-      for(String field : PAYLOAD_FIELDS)
-      {
-         if(original.getValues().containsKey(field))
-         {
-            content.setValue(field, original.getValue(field));
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Flush only redacted copies. A crash/failure leaves value-free placeholders.
-    ** Redacted proposals cannot later submit token strings to an application field.
-    *******************************************************************************/
-   public void flush(AssistantStore store) throws QException
-   {
-      Map<List<String>, QRecord> writes;
-      Boolean complete;
-      synchronized(this)
-      {
-         complete = workers == 0;
-         flushing = complete;
-         writes = new LinkedHashMap<>(pending);
-         pending.clear();
-      }
-      for(var entry : writes.entrySet())
-      {
-         QRecord record = entry.getValue();
-         String table = entry.getKey().getFirst();
-         if(AssistantPendingAction.TABLE_NAME.equals(table) && record.getValueString("paramsJson") != null)
-         {
-            Boolean changed = !complete || !record.getValueString("paramsJson").equals(payload(record.getValueString("paramsJson")));
-            record.setValue("status", changed ? AssistantPendingAction.STATUS_REJECTED : AssistantPendingAction.STATUS_PENDING);
-            if(changed)
-            {
-               record.setValue("resultSummary", "Classified values were removed. Make this change in the application.");
-            }
-         }
-         store.updateFields(table, record);
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** A timed-out tool can finish after the engine; retain its log protection.
-    *******************************************************************************/
-   public synchronized Boolean retainWorker()
-   {
-      if(closed)
-      {
-         return (false);
-      }
-      workers++;
-      return (true);
-   }
-
-
-
-   /*******************************************************************************
-    ** Release a completed worker.
-    *******************************************************************************/
-   public synchronized void releaseWorker()
-   {
-      workers--;
-      releaseIfDone();
-   }
-
-
-
-   /*******************************************************************************
-    ** Clear classified values only after the engine and all tool workers finish.
-    *******************************************************************************/
-   private void releaseIfDone()
-   {
-      if(closed && workers == 0)
-      {
-         released = true;
-         QLogger.unregisterRedactor(this);
-         replacements.clear();
-         recordTokens.clear();
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Always release raw data and unregister, including failed/cancelled turns.
-    *******************************************************************************/
-   @Override
-   public synchronized void close()
-   {
-      closed = true;
-      pending.clear();
-      releaseIfDone();
-      detach();
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/processes/DataAccessDefaultsProcess.java

@@ -1,268 +0,0 @@
-/*
- * Copyright 2026 Kingsrook, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.processes;
-
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import com.kingsrook.qbits.assistant.AssistantRuntime;
-import com.kingsrook.qbits.assistant.access.DataAccessMode;
-import com.kingsrook.qbits.assistant.access.DataAccessService;
-import com.kingsrook.qbits.assistant.metadata.AssistantMetaDataBuilder;
-import com.kingsrook.qbits.assistant.model.AssistantDataAccess;
-import com.kingsrook.qbits.assistant.persistence.AssistantStore;
-import com.kingsrook.qqq.backend.core.context.QContext;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLine;
-import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLineInterface;
-import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput;
-import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput;
-import com.kingsrook.qqq.backend.core.model.actions.processes.Status;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
-import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-import com.kingsrook.qqq.backend.core.model.metadata.layout.QIcon;
-import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.AbstractExtractStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.AbstractLoadStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.AbstractTransformStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.ProcessSummaryProviderInterface;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.StreamedETLWithFrontendProcess;
-
-
-/*******************************************************************************
- ** "Add rows for every table": a table action on assistant_data_access that
- ** writes one row per application table that has none yet, with the access
- ** the assistant already gets by default (READ, or NONE where the table's AI
- ** exposure is NONE). It changes no behavior on its own; it makes the defaults
- ** visible and editable. Existing rows are never touched. Standard streamed
- ** ETL: Review lists what will be added, Result what was added.
- *******************************************************************************/
-public final class DataAccessDefaultsProcess
-{
-   public static final String NAME = "assistantDataAccessAddDefaults";
-
-   public static final String NOTE = "Added by 'Add rows for every table': the assistant's default for this table. The user's own permissions still apply.";
-
-
-
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private DataAccessDefaultsProcess()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** The process: a table-level action (no records need to be selected).
-    *******************************************************************************/
-   public static QProcessMetaData process()
-   {
-      Map<String, Serializable> values = new HashMap<>();
-      values.put(StreamedETLWithFrontendProcess.FIELD_SOURCE_TABLE, AssistantDataAccess.TABLE_NAME);
-      values.put(StreamedETLWithFrontendProcess.FIELD_DESTINATION_TABLE, AssistantDataAccess.TABLE_NAME);
-      values.put(StreamedETLWithFrontendProcess.FIELD_SUPPORTS_FULL_VALIDATION, false);
-      values.put(StreamedETLWithFrontendProcess.FIELD_PREVIEW_MESSAGE,
-         "These rows will be added: one per table that has none, with the access the assistant already has by default. Existing rows are not changed.");
-      QProcessMetaData process = StreamedETLWithFrontendProcess.defineProcessMetaData(Extract.class, Transform.class, Load.class, values);
-      process.setName(NAME);
-      process.setLabel("Add rows for every table");
-      process.setIcon(new QIcon("playlist_add"));
-      process.setTableName(AssistantDataAccess.TABLE_NAME);
-      process.setMinInputRecords(0);
-      process.setPermissionRules(AssistantMetaDataBuilder.adminRules());
-      return (process);
-   }
-
-
-
-   /*******************************************************************************
-    ** The rows that are missing: one per application table without a row.
-    *******************************************************************************/
-   public static List<AssistantDataAccess> missingRows(QInstance qInstance, DataAccessService access, AssistantStore store) throws QException
-   {
-      ////////////////////////////////////////////////////////////////////
-      // fresh rows: a row deleted on another server must not come back //
-      // from this server's cache as a "default"                        //
-      ////////////////////////////////////////////////////////////////////
-      access.invalidate();
-      Set<String> existing = new HashSet<>();
-      for(AssistantDataAccess row : store.query(AssistantDataAccess.TABLE_NAME, new QQueryFilter().withLimit(10_000), AssistantDataAccess.class))
-      {
-         if(row.getObjectType() == null || AssistantDataAccess.TYPE_TABLE.equals(row.getObjectType()))
-         {
-            existing.add(row.getObjectName());
-         }
-      }
-
-      List<AssistantDataAccess> rs = new ArrayList<>();
-      for(QTableMetaData table : qInstance.getTables().values().stream().sorted((a, b) -> a.getName().compareTo(b.getName())).toList())
-      {
-         if(table.getName().startsWith("assistant_") || existing.contains(table.getName()))
-         {
-            continue;
-         }
-         DataAccessMode mode = access.forTable(table.getName()).mode();
-         rs.add(new AssistantDataAccess().withObjectType(AssistantDataAccess.TYPE_TABLE).withObjectName(table.getName())
-            .withMode(mode.name()).withNotes(NOTE));
-      }
-      return (rs);
-   }
-
-
-
-   /*******************************************************************************
-    ** The running assistant (or a clear error).
-    *******************************************************************************/
-   private static AssistantRuntime runtime() throws QException
-   {
-      AssistantRuntime runtime = AssistantRuntime.of(QContext.getQInstance());
-      if(runtime == null)
-      {
-         throw (new QException("The assistant is not running on this server."));
-      }
-      return (runtime);
-   }
-
-
-
-   /*******************************************************************************
-    ** Extract: the missing rows, computed (no query of the selected records).
-    *******************************************************************************/
-   public static class Extract extends AbstractExtractStep
-   {
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      @Override
-      public Integer doCount(RunBackendStepInput input) throws QException
-      {
-         AssistantRuntime runtime = runtime();
-         return (missingRows(QContext.getQInstance(), runtime.getDataAccessService(), runtime.getStore()).size());
-      }
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      @Override
-      public void run(RunBackendStepInput input, RunBackendStepOutput output) throws QException
-      {
-         AssistantRuntime runtime = runtime();
-         for(AssistantDataAccess row : missingRows(QContext.getQInstance(), runtime.getDataAccessService(), runtime.getStore()))
-         {
-            getRecordPipe().addRecord(row.toQRecord());
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Transform: counts by mode for the review screen.
-    *******************************************************************************/
-   public static class Transform extends AbstractTransformStep implements ProcessSummaryProviderInterface
-   {
-      private final Map<String, ProcessSummaryLine> byMode = new HashMap<>();
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      @Override
-      public void runOnePage(RunBackendStepInput input, RunBackendStepOutput output) throws QException
-      {
-         for(QRecord record : input.getRecords())
-         {
-            String mode = record.getValueString("mode");
-            byMode.computeIfAbsent(mode, m -> DiscoverModelsProcess.line("NONE".equals(m) ? Status.INFO : Status.OK,
-               "table will get a row with access " + m, "tables will get a row with access " + m,
-               "table got a row with access " + m, "tables got a row with access " + m)).incrementCountAndAddPrimaryKey(record.getValue("objectName"));
-            output.getRecords().add(record);
-         }
-      }
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      @Override
-      public ArrayList<ProcessSummaryLineInterface> getProcessSummary(RunBackendStepOutput output, boolean isForResultScreen)
-      {
-         ArrayList<ProcessSummaryLineInterface> lines = new ArrayList<>();
-         byMode.values().forEach(line -> line.addSelfToListIfAnyCount(lines));
-         if(lines.isEmpty())
-         {
-            lines.add(new ProcessSummaryLine(Status.INFO, null, "Every table already has a row."));
-         }
-         return (lines);
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Load: insert through the store (the user's own session; admin only).
-    *******************************************************************************/
-   public static class Load extends AbstractLoadStep implements ProcessSummaryProviderInterface
-   {
-      private final ProcessSummaryLine added = DiscoverModelsProcess.line(Status.OK, "row was added", "rows were added", "row was added", "rows were added");
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      @Override
-      public void runOnePage(RunBackendStepInput input, RunBackendStepOutput output) throws QException
-      {
-         AssistantRuntime runtime = runtime();
-         for(QRecord record : input.getRecords())
-         {
-            AssistantDataAccess row = runtime.getStore().insert(new AssistantDataAccess(record));
-            added.incrementCountAndAddPrimaryKey(row.getId());
-            output.getRecords().add(row.toQRecord());
-         }
-         runtime.getDataAccessService().invalidate();
-      }
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      @Override
-      public ArrayList<ProcessSummaryLineInterface> getProcessSummary(RunBackendStepOutput output, boolean isForResultScreen)
-      {
-         ArrayList<ProcessSummaryLineInterface> lines = new ArrayList<>();
-         added.addSelfToListIfAnyCount(lines);
-         return (lines);
-      }
-   }
-
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/processes/KnowledgeIndexProcess.java

@@ -23,10 +23,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import com.kingsrook.qbits.assistant.AssistantRuntime;
+import com.kingsrook.qbits.assistant.classification.DataClassification;
 import com.kingsrook.qbits.assistant.metadata.AssistantMetaDataBuilder;
 import com.kingsrook.qbits.assistant.model.AssistantRagSource;
 import com.kingsrook.qbits.assistant.rag.RagService;
-import com.kingsrook.qqq.backend.core.actions.ai.DataClassification;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLineInterface;

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/processes/ScheduledTaskProcess.java

@@ -1,241 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2026.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.kingsrook.qbits.assistant.processes;
-
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.kingsrook.qbits.assistant.AssistantQBitConfig;
-import com.kingsrook.qbits.assistant.AssistantRuntime;
-import com.kingsrook.qbits.assistant.AssistantSecurity;
-import com.kingsrook.qbits.assistant.metadata.AssistantMetaDataBuilder;
-import com.kingsrook.qbits.assistant.model.AssistantScheduledTask;
-import com.kingsrook.qbits.assistant.scheduled.ScheduledTaskRunner;
-import com.kingsrook.qbits.assistant.scheduled.ScheduledTasks;
-import com.kingsrook.qqq.backend.core.actions.processes.BackendStep;
-import com.kingsrook.qqq.backend.core.context.QContext;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLineInterface;
-import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput;
-import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput;
-import com.kingsrook.qqq.backend.core.model.actions.processes.Status;
-import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
-import com.kingsrook.qqq.backend.core.model.metadata.layout.QIcon;
-import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.scheduleing.QScheduleMetaData;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.AbstractLoadStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.AbstractTransformStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.ExtractViaQueryStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.ProcessSummaryProviderInterface;
-import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.StreamedETLWithFrontendProcess;
-
-
-/*******************************************************************************
- ** Admin record actions and the scheduler's bookkeeping step. No nav processes.
- *******************************************************************************/
-public final class ScheduledTaskProcess
-{
-   public static final String RUNNER = "assistantScheduledTasksRunner";
-
-
-
-   /*******************************************************************************
-    ** Utility class.
-    *******************************************************************************/
-   private ScheduledTaskProcess()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** QQQ supplies the scheduler session. No session is created here.
-    *******************************************************************************/
-   public static List<QProcessMetaData> processes(AssistantQBitConfig config)
-   {
-      List<QProcessMetaData> result = new ArrayList<>();
-      QProcessMetaData runner = new QProcessMetaData().withName(RUNNER).withLabel("Run due assistant tasks")
-         .withPermissionRules(AssistantMetaDataBuilder.adminRules())
-         .withStep(new QBackendStepMetaData().withName("runDue").withCode(new QCodeReference(Runner.class)));
-      if(config.getScheduledTasksSchedulerName() != null && !config.getScheduledTasksSchedulerName().isBlank())
-      {
-         runner.withSchedule(new QScheduleMetaData().withSchedulerName(config.getScheduledTasksSchedulerName()).withRepeatSeconds(60));
-      }
-      result.add(runner);
-      for(String action : List.of("Approve", "Revoke", "RunNow"))
-      {
-         String label = "Approve".equals(action) ? "Approve write mode" : "Revoke".equals(action) ? "Revoke write mode" : "Run now";
-         Map<String, Serializable> values = new HashMap<>();
-         values.put(StreamedETLWithFrontendProcess.FIELD_SOURCE_TABLE, AssistantScheduledTask.TABLE_NAME);
-         values.put(StreamedETLWithFrontendProcess.FIELD_DESTINATION_TABLE, AssistantScheduledTask.TABLE_NAME);
-         values.put(StreamedETLWithFrontendProcess.FIELD_SUPPORTS_FULL_VALIDATION, true);
-         values.put(StreamedETLWithFrontendProcess.FIELD_DO_FULL_VALIDATION, true);
-         values.put(StreamedETLWithFrontendProcess.FIELD_PREVIEW_MESSAGE, label + " for the selected tasks.");
-         values.put("scheduledAction", action);
-         QProcessMetaData process = StreamedETLWithFrontendProcess.defineProcessMetaData(ExtractViaQueryStep.class, Review.class, Result.class, values);
-         process.setName("assistantScheduledTask" + action);
-         process.setLabel(label);
-         process.setIcon(new QIcon("schedule"));
-         process.setTableName(AssistantScheduledTask.TABLE_NAME);
-         process.setPermissionRules(AssistantMetaDataBuilder.adminRules());
-         result.add(process);
-      }
-      return (result);
-   }
-
-
-
-   /*******************************************************************************
-    ** Actions must enforce permission even when called outside the UI executor.
-    *******************************************************************************/
-   private static AssistantRuntime admin() throws QException
-   {
-      if(QContext.getQSession() == null || !QContext.getQSession().hasPermission(AssistantQBitConfig.ADMIN_PERMISSION))
-      {
-         throw (new QException("assistant.admin is required for scheduled task actions."));
-      }
-      return (AssistantRuntime.of(QContext.getQInstance()));
-   }
-
-
-
-   /*******************************************************************************
-    ** Background scheduler step uses only the context supplied by QQQ.
-    *******************************************************************************/
-   public static class Runner implements BackendStep
-   {
-      /*******************************************************************************
-       ** Dispatch the due page once.
-       *******************************************************************************/
-      @Override
-      public void run(RunBackendStepInput input, RunBackendStepOutput output) throws QException
-      {
-         output.addValue("runs", new ScheduledTaskRunner(AssistantRuntime.of(QContext.getQInstance())).runDue());
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Review binds the displayed prompt hash and user to the exact settings.
-    *******************************************************************************/
-   public static class Review extends AbstractTransformStep implements ProcessSummaryProviderInterface
-   {
-      private final ArrayList<ProcessSummaryLineInterface> lines = new ArrayList<>();
-
-
-
-      /*******************************************************************************
-       ** No login or model call on Review.
-       *******************************************************************************/
-      @Override
-      public void runOnePage(RunBackendStepInput input, RunBackendStepOutput output) throws QException
-      {
-         admin();
-         for(QRecord record : input.getRecords())
-         {
-            AssistantScheduledTask task = new AssistantScheduledTask(record);
-            record.setValue("reviewedHash", ScheduledTasks.approvalHash(task));
-            lines.add(TestConnectionProcess.single(Status.INFO, "Run as " + task.getRunAsUserId() + "; prompt SHA-256 " + ScheduledTasks.hash(task.getPrompt())
-               + ". Write mode permits policy-allowed create, update and delete proposals; writes wait for this user's panel confirmation.", task.getId()));
-            output.getRecords().add(record);
-         }
-      }
-
-
-
-      /*******************************************************************************
-       ** Standard streamed ETL Review lines.
-       *******************************************************************************/
-      @Override
-      public ArrayList<ProcessSummaryLineInterface> getProcessSummary(RunBackendStepOutput output, boolean isForResultScreen)
-      {
-         return (lines);
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Result rereads tasks; a change since Review requires a fresh review.
-    *******************************************************************************/
-   public static class Result extends AbstractLoadStep implements ProcessSummaryProviderInterface
-   {
-      private final ArrayList<ProcessSummaryLineInterface> lines = new ArrayList<>();
-
-
-
-      /*******************************************************************************
-       ** Approval records the actual administrator's session user id.
-       *******************************************************************************/
-      @Override
-      public void runOnePage(RunBackendStepInput input, RunBackendStepOutput output) throws QException
-      {
-         AssistantRuntime runtime = admin();
-         String action = input.getValueString("scheduledAction");
-         for(QRecord record : input.getRecords())
-         {
-            AssistantScheduledTask task = runtime.getStore().scheduledTask(record.getValueInteger("id"));
-            if(task == null || !ScheduledTasks.approvalHash(task).equals(record.getValueString("reviewedHash")))
-            {
-               throw (new QException("The task changed after Review. Review it again."));
-            }
-            String summary;
-            if("RunNow".equals(action))
-            {
-               var run = new ScheduledTaskRunner(runtime).run(task, true);
-               summary = run == null ? "Task already claimed." : "Run " + run.getId() + ": " + run.getStatus();
-            }
-            else if("Approve".equals(action) || "Revoke".equals(action))
-            {
-               Boolean approve = "Approve".equals(action);
-               runtime.getStore().scheduledUpdate(new QRecord().withValue("id", task.getId())
-                  .withValue("writeModeApprovedBy", approve ? AssistantSecurity.userId(QContext.getQSession()) : null)
-                  .withValue("writeModeApprovedAt", approve ? runtime.getClock().instant() : null)
-                  .withValue("writeModeApprovalHash", approve ? ScheduledTasks.approvalHash(task) : null));
-               summary = approve ? "Write mode approved." : "Write mode revoked.";
-            }
-            else
-            {
-               throw (new QException("Unknown scheduled task action."));
-            }
-            lines.add(TestConnectionProcess.single(Status.INFO, summary, task.getId()));
-            output.getRecords().add(record);
-         }
-      }
-
-
-
-      /*******************************************************************************
-       ** Standard streamed ETL Result lines.
-       *******************************************************************************/
-      @Override
-      public ArrayList<ProcessSummaryLineInterface> getProcessSummary(RunBackendStepOutput output, boolean isForResultScreen)
-      {
-         return (lines);
-      }
-   }
-}

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/provider/AssistantModelProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.kingsrook.qbits.assistant.spi;
+package com.kingsrook.qbits.assistant.provider;
 
 
 /*******************************************************************************

qbit-assistant/src/main/java/com/kingsrook/qbits/assistant/provider/AssistantProviderType.java

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.kingsrook.qbits.assistant.spi;
+package com.kingsrook.qbits.assistant.provider;
 
 
 import java.util.List;
+import com.kingsrook.qbits.assistant.model.AssistantProvider;
 
 
 /*******************************************************************************
@@ -139,10 +140,8 @@ public interface AssistantProviderType
 
    /*******************************************************************************
     ** Additional settings errors, without resolving credentials or doing I/O.
-    ** Settings contain configured values and apiKeyEnvName; apiKey, the bearer
-    ** token supplier and SSLContext are not resolved for validation.
     *******************************************************************************/
-   default List<String> validate(ProviderSettings settings)
+   default List<String> validate(AssistantProvider row)
    {
       return (List.of());
    }