@yadsh/dsh-qa-surface 0.19.0 → 0.21.0

package/README.md

@@ -23,10 +23,74 @@ Session and Agent Loop.
 
 ## What it does
 
+Chat history supports virtual folders and a separate pinned section. Create,
+rename, collapse and delete folders; drag chats into folders, out to the root,
+or into the pinned section. Drag rows or folder headers to arrange them, or use
+the chat menu and folder settings with a keyboard. Unpinning returns a chat to
+its previous folder. Moving a pinned chat into a folder unpins it. Deleting a
+folder leaves its chats in history, preserving any pins. Search includes folder
+names and reveals matching chats inside collapsed folders.
+
+This organization is browser-local and scoped to the QA route and account ID.
+It survives reloads and updates other tabs on the same origin through storage
+events; it does not synchronize between devices. Folder membership and pins
+change only presentation metadata: session IDs, workspace roots, physical files,
+ownership and access remain as they were.
+
+Under **Integration tokens**, choose **Folder for new chats** when creating a
+credential, or change the destination on an existing active token without
+reissuing it. This default is stored on the server as a virtual folder ID and
+display name. Each newly created API conversation snapshots it before its first
+answer, even when no browser is open. Authenticated history imports that folder
+and assignment once; manual moves and folder deletions are preserved. Changing
+or clearing a token's default affects future conversations, not continuations
+of an existing `session_id`. The default does not change workspace paths or
+grant access to another account's chats. The folder picker lists folders from
+this browser's history and retains an existing server selection from another
+browser. New API chats can recreate a selected folder that was deleted locally;
+clear or change the token default to stop using that destination.
+
 Corporate sign-in through Keycloak or another OpenID Connect provider is opt-in.
 The source tree includes `plugins/dsh-qa-surface/docs/oidc.md` with client settings,
 account linking, role admission, session limits and deployment acceptance.
 
+The composer has one compact **Chat settings** menu beside the attachment
+button. Its summary shows the current model and code version. The **Model**
+and **Code version** entries open nested choice lists with a checkmark for the
+current value; Back, Escape and arrow keys navigate the levels. The menu closes
+after a successful choice and stays open with an error if saving fails. Model
+choices appear when the role or account permits alternatives; code choices
+appear when a code-source catalog is configured.
+
+Choosing a model applies to the current chat and
+survives reopening it; new chats keep the configured default. Switching waits
+until the chat has finished its response and has no queued request. Readers,
+participants and delegated-agent views cannot change the owner's model.
+
+Administrators set the default and **Alternative models for the user** in the
+role's Model tab or the account's model settings. `model` keeps its existing
+priority: account, role, deployment. The optional `allowedModels` array adds
+provider/model pairs to that default. An omitted account array inherits its
+role's alternatives; `[]` explicitly restricts that account to its default.
+An omitted role array grants no alternatives. Saved policies keep their
+previous single-model behavior until an administrator grants alternatives.
+The server filters the catalog and validates every selection against the
+owner's current policy, including model replacement rules.
+
+Chat-local selection uses the Session controller's guarded selection commit
+capability, which records the native `model/selection` event and updates the
+next-request selection without saving the Host operator's global default.
+A Host without that capability rejects the switch rather than changing a
+deployment-wide preference. The rest of the QA surface remains available.
+
+The focused packed browser check is `pnpm --filter @yadsh/dsh-qa-surface
+e2e:browser --model-selection`. Set `DSH_QA_SMOKE_VERSION` to the Host version
+being checked, and optionally `DSH_QA_HISTORY_EVIDENCE_DIR` to a local evidence
+directory. This pass exercises synthetic model routes without real provider
+credentials, including access filtering, switching, reload persistence,
+new-chat defaults, and desktop/phone layout. It does not run the separate LAN
+deployment-overlay acceptance pass.
+
 - contributes one root-scoped entry to the additive `shell.overlay` slot;
 - stays invisible outside the configured route;
 - creates or restores one real DSH Session;
@@ -327,6 +391,11 @@ config:
     # Presets whose sessions may unlock the catalog. Empty leaves the gate open:
     # only do that when this Host serves one agent composition.
     activationPresets: []
+    # Native file writes and edits in QA chats, delegated calls included.
+    # Exact case-insensitive suffixes; [] disables this additional restriction.
+    fileWritePolicy:
+      blockedExtensions: [.py, .pyw]
+      message: "Do not create or execute scripts. Use the available document and spreadsheet tools. If an operation is unavailable, report the limitation."
     # Where the documentation readers look. Empty reads `docs/` inside each
     # chat's own workspace; name the corpus when it is published once, outside
     # every per-user workspace (see "Dynamic QA tools" below).
@@ -338,6 +407,35 @@ uses the Host's normal default working directory. Put the system prompt, tools,
 skills, knowledge connections and permission policy in `agentPreset`, not in
 this UI plugin.
 
+### File write policy
+
+The operator's QA settings card includes **Запись файлов**: a list of blocked
+extensions and the refusal message returned to the agent. The default list is
+`.py`, `.pyw`. Changes apply to the next tool call, including existing chats
+and their delegated agents; restarting the Host is unnecessary after changing
+the settings on a build that includes this feature.
+
+The native `write`, `edit` and mutating `str_replace_editor` commands are denied
+before dispatch. Reads and the editor's `view` command remain subject to their
+existing access rules. Matching ignores case, accepts extensions with or without
+a leading dot, and supports compound suffixes such as `.tar.gz`. The policy
+checks both the requested filename and its canonical target, so an allowed
+symlink name cannot overwrite a blocked file. `[]` disables only this policy;
+it does not grant sandbox or tool access. The message must contain 1–4000
+characters. Paths and wildcards are refused in the extension list.
+
+This is a native file-tool policy, not a content classifier or a general process
+sandbox: it does not inspect scripts disguised with an allowed extension or
+outputs produced by other tools. Existing QA restrictions on shell execution
+and `apply_patch` remain in force independently.
+
+Run `pnpm --filter @yadsh/dsh-qa-surface smoke:packed --file-write-settings`
+to check the settings in Chromium against a disposable packed Host. Set
+`DSH_QA_FILE_WRITE_EVIDENCE` to a local directory to retain screenshots and
+geometry measurements. The round covers save/reload, empty-list handling,
+invalid-message refusal, reset, and light/dark layouts at 390 and 1440 pixels;
+it also runs as part of the full `e2e:browser` pass.
+
 ### Dynamic QA tools
 
 A QA deployment tends to grow a large toolset, and attaching all of it at boot
@@ -423,6 +521,83 @@ dynamically attached tool gets the same scrutiny as an allow-listed one. Tool
 visibility is not an authorization boundary — a QA tool that writes must still
 enforce its own permissions.
 
+### Multiple code sources
+
+`codeSources` defines named code trees independently of folder and branch
+names. Configure it on the QA Surface row; preset-mounted Git tools read
+this same catalogue unless their own non-empty catalogue overrides it.
+
+```yaml
+codeSources:
+  defaultSource: stable
+  entries:
+    - id: stable
+      label: "Stable release"
+      path: /srv/code/release-a
+      docsVersion: "2.0"
+    - id: preview
+      label: "Development"
+      path: /srv/code/work-in-progress
+      docsVersion: "2.0"
+lockdown:
+  sharedReadOnlyRoots:
+    - /srv/code
+```
+
+Grant Git access separately with `repositoryRoots: [/srv/code]` on the
+Git plugin row mounted in the agent preset. Adding a catalogue entry does
+not grant either filesystem or Git access. The chat's writable scratch
+directory stays separate from the read-only code trees.
+
+After QA tool activation, `code_sources {}` reports the catalogue, its default
+and each tree's read availability. `code_read` and `code_search` accept
+`source: stable` or `source: preview` and source-relative `path` values.
+Omitting `source` uses `defaultSource`, or the only entry when there is one;
+several entries without a default require an explicit choice. A missing,
+unreadable or unknown source fails without falling back to another tree.
+Use the same id in `dsh_git_*` calls. Generic `read`, `glob` and `grep` still
+use explicit paths; use the source-aware tools for version-scoped work.
+
+Search is literal and case-insensitive, bounded to 1,000 attempted text
+files, 10,000 visited entries, 8 MiB of input, three seconds and 32 KiB of
+results. It skips links, binary/oversized files and common generated
+directories (`.git`, `node_modules`, `.nx`, `.cache`, `bin`, `obj`, `dist`,
+`lib`). `truncated` means incomplete: narrow `path` or query before
+concluding code is absent. Reading accepts UTF-8 files up to 1 MiB and
+returns at most 400 lines and 32 KiB. Both tools refuse traversal and nested
+symbolic links. Results carry the source id, label and root; file provenance
+preserves the source id and actual file address.
+
+`docs_search` accepts `source` and uses its optional `docsVersion` mapping.
+When neither `source`, `version` nor `path` is given, the default source's
+mapping takes precedence over `tools.docsDefaultVersion`. Without a mapping,
+the existing documentation default stays in force. An explicit `version`
+or `path` without `source` retains its override behaviour. An explicit
+`source` without a mapping is refused, as is a conflicting explicit edition.
+`docs_read` validates the file's edition against the chat's selected source
+unless a different source is explicitly named. Release and development sources
+may share a documentation edition.
+
+The **Версия кода** entry in the composer's shared settings menu saves an explicit source for
+the chat on the server. Reopening the chat or using another browser restores
+that choice. **По умолчанию** clears the override and follows the deployment
+default. Draft selection creates no session: it is saved before the first
+prompt, and a failed save prevents the prompt and can be retried.
+
+Only the chat owner can change the source. Shared readers and collaborators
+see the same choice, and changes are refused while the chat or its subagents
+are running, while input is queued, or while the chat waits for a server slot.
+The plugin stores preferences in `qa-code-sources.db` beside the accounts DB;
+include that database in deployment backups. New delegated children and forks
+snapshot the parent's effective source. Descendants keep that snapshot if the
+parent later changes its choice; an ordinary fork can change its own source.
+
+An omitted `source` in Git, code or documentation tools uses the persisted
+session choice. Explicit tool parameters still allow comparisons with another
+configured source and do not change the saved choice. Removing a selected
+source from configuration makes it unavailable rather than selecting another
+version. No directory is created, moved or updated by these tools.
+
 ### Writable per-user research space
 
 Set `accounts.perUserWorkspace: true` only together with accounts, a registered
@@ -519,6 +694,34 @@ then collapses to `Worked for ...` before the final answer. Tool capability is
 still controlled exclusively by `lockdown.toolPolicy.allow`; the display flags
 do not grant tools.
 
+When a provider retires a model identifier, `session.modelReplacements` defines
+exact central redirects after account → role → deployment precedence:
+
+```yaml
+session:
+  provider: local
+  model: model-v2
+  modelReplacements:
+    - from:
+        provider: local
+        model: model-v1
+      to:
+        provider: local
+        model: model-v2
+```
+
+The rule covers saved account and role pins as well as the deployment default;
+unrelated pairs keep their own selection. The terminal target must exist in the
+Host catalog. Cycles and duplicate sources are configuration errors. Chained
+redirects let a later transition cover older pins without editing every account;
+retain a rule while stored policies still refer to its source. The stored pins
+remain intact. New chats use the replacement immediately. On access attestation,
+an idle owned QA chat can move along an exact redirect to its current policy;
+an active turn is left unchanged. Ownership, workspace and adoption checks still
+precede reconciliation. A missing target fails explicitly instead of selecting
+another model from catalog order. The journal records the original and applied
+pairs, and delegated experts resolve the owning chat's policy through Host lineage.
+
 ### User profile
 
 Clicking the account name in the sidebar footer opens the signed-in user's
@@ -690,6 +893,17 @@ Changing the limit does not interrupt already active turns: lowering it admits
 no new chat until the active count fits, and raising it releases more waiters.
 Commands that do not run a turn remain usable while the stand is full.
 
+The number is the chain's last layer, and the two above it override it per turn:
+a subrole may carry `maxActiveRequests` (edited on the «Саброли» page's model
+tab), and an account may carry one (the user card's «Слоты очереди этого
+аккаунта» select). The account beats the role, the role beats the deployment,
+and 0 is a real value that lifts the ceiling for that role's or account's turns
+outright. A turn whose principal raises the number fits while a lower ceiling
+would refuse it, and one full principal does not starve the queue behind it.
+The status read answers the caller's own chain: a chat's read uses the chat's
+account, the pre-send read uses the visitor's, and a stand without accounts
+keeps the one deployment number.
+
 Regeneration: the last committed answer offers a retry action. The session log
 is append-only, so "regenerate" sends a hidden instruction as an ordinary
 prompt and the answer arrives as a follow-up turn; the projection hides that
@@ -1002,6 +1216,26 @@ export function apply(ctx: Context) {
 }
 ```
 
+Model-selectable QA delegation uses `qa_list_subagent_models` and `qa_subagent`.
+Grant both tools in the role's base tools or through an activated skill. They
+follow normal QA tool activation. Discovery returns only the chat owner's
+default and explicitly granted alternatives present in the live Host catalog,
+with the reasoning efforts that policy permits. Account overrides, role grants
+and model replacements use the same policy as the chat's model selector.
+`qa_subagent` accepts `description`, a self-contained `prompt`, the exact
+`provider`/`model` pair and optional `reasoning_effort`. It starts a fresh native
+`spawn` child, inherits the parent's preset and workspace, and respects Host
+depth limits, cancellation and parent result delivery. Model and effort grants
+are checked again after route resolution, before a child is created. The parent
+chat's model is unchanged. A missing spawn backend refuses the call; a Host
+without subagents can still load the QA surface.
+
+Run the packed integration check with
+`DSH_QA_SMOKE_VERSION=0.2.1-rc.3 pnpm --filter @yadsh/dsh-qa-surface run smoke:packed --subagent-models`.
+It uses a disposable Host and a scripted local LLM endpoint to verify model
+discovery for an ordinary account, denial of an unassigned model, a native child
+request on the selected route and preservation of the parent's model.
+
 Subagents: the deployment may opt the delegation family (`subagent`,
 `subagent_fork`, `send_message`, `list_agents`, `interrupt_agent`) into the
 lockdown allow-list; the preset must mount them. Launches then render as
@@ -1266,6 +1500,7 @@ integration:
   requestTimeoutMs: 3600000 # one-hour answer budget; see docs/INTEGRATION-API.md §2.5
   maxConcurrent: 4
   requestsPerMinute: 60
+  maxAttachments: 0 # 0 inherits attachments.maxPending; positive values set an API limit (1-40)
   maxAnswerCharacters: 4096 # the answer the ticket comment can hold
 ```
 

package/lib/access/model-choices.js

@@ -0,0 +1,103 @@
+import { SessionId } from "@deepseek-ai/dsh-session/types";
+import { ReasoningEffortId } from "@deepseek-ai/dsh-llm";
+import { sessionModelSelection } from "../session-model.js";
+import { modelPolicySatisfied, projectModelCatalog, } from "./model-policy.js";
+/** Only explicit policy grants are exposed to an ordinary account. */
+export async function userModelOptions(ctx, access, token, sessionId, subroleId, preview) {
+    const resolve = () => {
+        if (sessionId === null)
+            return access.draftModelPolicy(token, subroleId, preview);
+        return access.userSessionModelPolicy(token, sessionId);
+    };
+    resolve(); // Authenticate before reading the Host catalog.
+    const catalog = projectModelCatalog(await ctx.sessionController.modelCatalog());
+    const policy = resolve(); // Recheck the token and grants after the async read.
+    const granted = [
+        ...(policy.pair === undefined ? [] : [policy.pair]),
+        ...(policy.allowedModels ?? []),
+    ];
+    const models = catalog.filter((entry) => granted.some((pair) => pair.provider === entry.provider && pair.model === entry.model));
+    const agent = sessionId === null ? undefined : ctx.agents.get(SessionId(sessionId));
+    const facts = agent === undefined ? policy.pair : sessionModelSelection(ctx, agent);
+    const selected = facts?.provider === undefined || facts.model === undefined
+        ? undefined
+        : {
+            provider: facts.provider,
+            model: facts.model,
+            ...(facts.reasoningEffort === undefined
+                ? {}
+                : { reasoningEffort: facts.reasoningEffort }),
+        };
+    return {
+        models,
+        choices: granted,
+        ...(policy.pair === undefined ? {} : { defaultModel: policy.pair }),
+        ...(selected === undefined ? {} : { selected }),
+    };
+}
+/** Validate both policy membership and live availability before a user mutation. */
+export async function assertUserModelSelection(ctx, policy, request) {
+    if (typeof request.provider !== "string" || typeof request.model !== "string")
+        throw new Error("Choose a complete provider and model pair.");
+    const pair = {
+        provider: request.provider,
+        model: request.model,
+        ...(request.reasoningEffort == null
+            ? {}
+            : { reasoningEffort: request.reasoningEffort }),
+    };
+    const catalog = projectModelCatalog(await ctx.sessionController.modelCatalog());
+    const entry = catalog.find((item) => item.provider === pair.provider && item.model === pair.model);
+    if (entry === undefined)
+        throw new Error("This model is currently unavailable.");
+    if (pair.reasoningEffort !== undefined &&
+        !entry.reasoningEfforts.includes(pair.reasoningEffort))
+        throw new Error("This reasoning effort is unavailable for the selected model.");
+    const effective = policy();
+    if ((effective.pair === undefined && effective.allowedModels === undefined) ||
+        !modelPolicySatisfied(effective, pair))
+        throw new Error("This model is not allowed by the chat policy.");
+}
+/** Native durable per-session selection, without the operator-wide default save. */
+export async function selectUserModel(ctx, access, token, request) {
+    const id = String(request.sessionId);
+    const policy = () => access.userSessionModelPolicy(token, id);
+    policy();
+    const agent = ctx.agents.get(request.sessionId);
+    if (agent === undefined)
+        throw new Error("The chat is unavailable.");
+    // DSH's public selectModel also saves the operator-wide default. Its owned
+    // agent controller has the narrower commit primitive. Keep this compatibility
+    // bridge guarded and fail closed when the Host no longer exposes it; never
+    // fall back to changing a deployment-wide preference from a QA account.
+    const controller = ctx.sessionController.agents;
+    if (typeof controller?.serializeImageAdmission !== "function" ||
+        typeof controller.selectForNextRequest !== "function")
+        throw new Error("This Host does not support chat-local model selection.");
+    return controller.serializeImageAdmission(agent, async () => {
+        if (agent.status !== "idle")
+            throw new Error("Wait for the current response before changing the model.");
+        await assertUserModelSelection(ctx, policy, request);
+        const selected = await ctx.llm.resolveCallConfig({
+            provider: request.provider,
+            model: request.model,
+            ...(request.reasoningEffort === undefined
+                ? {}
+                : { reasoningEffort: ReasoningEffortId(request.reasoningEffort) }),
+        });
+        if (!modelPolicySatisfied(policy(), selected))
+            throw new Error("This model is not allowed by the chat policy.");
+        if (agent.status !== "idle")
+            throw new Error("Wait for the current response before changing the model.");
+        const pair = {
+            provider: selected.provider,
+            model: selected.model,
+            ...(selected.reasoningEffort === undefined
+                ? {}
+                : { reasoningEffort: selected.reasoningEffort }),
+        };
+        controller.selectForNextRequest(agent, pair);
+        return { selected: pair };
+    });
+}
+//# sourceMappingURL=model-choices.js.map

package/lib/access/model-choices.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-choices.js","sourceRoot":"","sources":["../../src/access/model-choices.ts"],"names":[],"mappings":"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"}

package/lib/access/model-policy.js

@@ -1,3 +1,28 @@
+/** Preserve an explicit empty override and reject malformed or excessive grants. */
+export function normalizeAllowedModels(value, label) {
+    if (value === undefined)
+        return undefined;
+    if (!Array.isArray(value) || value.length > 100)
+        throw new TypeError(`${label} must be an array of at most 100 model pairs`);
+    const pairs = value.map((entry, index) => {
+        const pair = normalizeModelPair(entry, `${label}[${index}]`);
+        if (pair === undefined)
+            throw new TypeError(`${label} needs complete pairs`);
+        return pair;
+    });
+    return Object.freeze([
+        ...new Map(pairs.map((pair) => [JSON.stringify(pair), pair])).values(),
+    ]);
+}
+/** Add explicit grants without changing which model a new chat starts on. */
+export function withAllowedModels(policy, models, replacements) {
+    if (models === undefined)
+        return policy;
+    return Object.freeze({
+        ...policy,
+        allowedModels: Object.freeze(models.map((pair) => replaceModelPair(pair, replacements))),
+    });
+}
 function text(value) {
     return typeof value === "string" ? value.trim() : "";
 }
@@ -47,18 +72,62 @@ export function deploymentModelPair(session) {
  * @param layers - the layers in priority order, `undefined` where a layer keeps
  *   no opinion.
  */
-export function resolveModelPolicy(layers) {
+export function resolveModelPolicy(layers, replacements = []) {
     const order = [
         "account",
         "subrole",
         "deployment",
     ];
     const layer = order.find((candidate) => layers[candidate] !== undefined);
+    const original = layer === undefined ? undefined : layers[layer];
+    const pair = replaceModelPair(original, replacements);
     return Object.freeze({
-        pair: layer === undefined ? undefined : layers[layer],
+        pair,
         layer,
+        ...(original !== undefined && pair !== original
+            ? { redirectedFrom: original }
+            : {}),
     });
 }
+/** Resolve only explicitly configured exact redirects; never guess from catalog order. */
+export function replaceModelPair(pair, replacements) {
+    if (pair === undefined)
+        return undefined;
+    let current = pair;
+    const visited = new Set();
+    for (;;) {
+        const key = JSON.stringify([current.provider, current.model]);
+        if (visited.has(key))
+            throw new TypeError("session.modelReplacements contains a cycle");
+        visited.add(key);
+        const next = replacements.find(({ from }) => from.provider === current.provider && from.model === current.model);
+        if (next === undefined)
+            return current;
+        current = next.to;
+    }
+}
+export function normalizeModelReplacements(input) {
+    if (input === undefined)
+        return Object.freeze([]);
+    if (!Array.isArray(input) || input.length > 100)
+        throw new TypeError("session.modelReplacements must be an array of at most 100 exact replacements");
+    const keys = new Set();
+    const replacements = input.map((entry, index) => {
+        const label = `session.modelReplacements[${index}]`;
+        const from = normalizeModelPair(entry?.from, `${label}.from`);
+        const to = normalizeModelPair(entry?.to, `${label}.to`);
+        if (from === undefined || to === undefined)
+            throw new TypeError(`${label} needs complete from/to pairs`);
+        const key = JSON.stringify([from.provider, from.model]);
+        if (keys.has(key))
+            throw new TypeError(`${label} duplicates a source pair`);
+        keys.add(key);
+        return Object.freeze({ from, to });
+    });
+    for (const { from } of replacements)
+        replaceModelPair(from, replacements);
+    return Object.freeze(replacements);
+}
 /**
  * Whether one agent's selection sits inside the session's model policy.
  *
@@ -70,12 +139,15 @@ export function resolveModelPolicy(layers) {
  */
 export function modelPolicySatisfied(policy, selection) {
     const pair = policy.pair;
-    if (pair === undefined)
+    if (pair === undefined && policy.allowedModels === undefined)
         return true;
-    return (pair.provider === selection.provider &&
-        pair.model === selection.model &&
-        (pair.reasoningEffort === undefined ||
-            pair.reasoningEffort === selection.reasoningEffort));
+    return [
+        ...(pair === undefined ? [] : [pair]),
+        ...(policy.allowedModels ?? []),
+    ].some((candidate) => candidate.provider === selection.provider &&
+        candidate.model === selection.model &&
+        (candidate.reasoningEffort === undefined ||
+            candidate.reasoningEffort === selection.reasoningEffort));
 }
 /**
  * Project the harness catalog into the pairs the administration surface lists.

package/lib/access/model-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-policy.js","sourceRoot":"","sources":["../../src/access/model-policy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-policy.js","sourceRoot":"","sources":["../../src/access/model-policy.ts"],"names":[],"mappings":"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"}

package/lib/access/model.js

@@ -1,7 +1,27 @@
-import { normalizeModelPair } from "./model-policy.js";
+import { normalizeModelPair, normalizeAllowedModels } from "./model-policy.js";
+import { QA_MAX_ACTIVE_REQUESTS_MAX } from "../config-resolvers/session.js";
 import { normalizeSkillOverride, resolveSkillVisibility, skillHealth, } from "./skill-metadata.js";
 const CAPABILITY_ID = /^[a-zA-Z0-9][a-zA-Z0-9._:/-]{0,199}$/u;
 const SUBROLE_ID = /^[a-z0-9][a-z0-9-]{0,63}$/u;
+/**
+ * Normalize one queue-slots override.
+ *
+ * An absent field keeps no opinion and the layer below it speaks. 0 is a real
+ * value — it lifts the ceiling for this role or account — while anything that
+ * is not an integer from 0 to {@link QA_MAX_ACTIVE_REQUESTS_MAX} is refused,
+ * the same range the deployment's own field accepts.
+ */
+export function normalizeQueueSlots(value, label) {
+    if (value === undefined || value === null)
+        return undefined;
+    if (typeof value !== "number" ||
+        !Number.isSafeInteger(value) ||
+        value < 0 ||
+        value > QA_MAX_ACTIVE_REQUESTS_MAX) {
+        throw new TypeError(`${label} must be an integer from 0 to ${String(QA_MAX_ACTIVE_REQUESTS_MAX)}`);
+    }
+    return value;
+}
 function uniqueIds(values, label) {
     const result = [
         ...new Set(values.map((value) => {
@@ -78,6 +98,8 @@ export function normalizeSubrole(value) {
     const icon = value.ui?.icon?.trim();
     const accent = value.ui?.accent?.trim();
     const model = normalizeModelPair(value.model, `subrole ${id}.model`);
+    const allowedModels = normalizeAllowedModels(value.allowedModels, `subrole ${id}.allowedModels`);
+    const maxActiveRequests = normalizeQueueSlots(value.maxActiveRequests, `subrole ${id}.maxActiveRequests`);
     return Object.freeze({
         id,
         name,
@@ -85,6 +107,8 @@ export function normalizeSubrole(value) {
         enabled: value.enabled === true,
         capabilities: normalizeCapabilitySelection(value.capabilities),
         ...(model === undefined ? {} : { model }),
+        ...(allowedModels === undefined ? {} : { allowedModels }),
+        ...(maxActiveRequests === undefined ? {} : { maxActiveRequests }),
         ...(icon === undefined && accent === undefined
             ? {}
             : {
@@ -196,10 +220,14 @@ export function normalizeUserAccess(value, config) {
         ? requestedDefault
         : allowed[0];
     const model = normalizeModelPair(value?.model, "account model");
+    const allowedModels = normalizeAllowedModels(value?.allowedModels, "account allowedModels");
+    const maxActiveRequests = normalizeQueueSlots(value?.maxActiveRequests, "account maxActiveRequests");
     return Object.freeze({
         allowedSubroles: Object.freeze(allowed),
         defaultSubrole,
         ...(model === undefined ? {} : { model }),
+        ...(allowedModels === undefined ? {} : { allowedModels }),
+        ...(maxActiveRequests === undefined ? {} : { maxActiveRequests }),
     });
 }
 function available(values, installed) {