@vllm-sr/dsh 0.4.0 → 0.4.2

package/README.md

@@ -1,7 +1,6 @@
 # @vllm-sr/dsh
 
-**System Duo** for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness): *Thinking, fast and slow. One
-key.*
+**System Duo** for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness): *Thinking, fast and slow.*
 
 An agent's LLM thinks slowly, in tokens. System One, a decision model, answers the many small questions around it in
 about half a second each, with calibrated probabilities: is this command dangerous, does this file try to give the
@@ -12,22 +11,25 @@ agent orders, is the work really done, which team should get each of these 230 t
 - **System One**, the decision model, decides: `vllm-sr/d3-ultra`. It answers typed questions (choice, yes/no, score,
   box) with probabilities, from one forward pass per question instead of generated text.
 
-Both come from [System Duo](https://app.vllm-sr.ai) with one free key, and the plugin gets that key for you: System One
-answers at `https://app.vllm-sr.ai/v1/systemone`, and `vllm-sr/auto` at `https://app.vllm-sr.ai/v1/chat/completions`.
+Both take a free [System Duo](https://app.vllm-sr.ai) key, which the plugin gets for you: System One answers at `https://app.vllm-sr.ai/v1/systemone`,
+and `vllm-sr/auto` at `https://app.vllm-sr.ai/v1/chat/completions`.
 
 ## Quick start
 
 ```bash
-npm install -g @deepseek-ai/dsh                 # DeepSeek Harness 0.2.1-rc.5 or a later 0.2 release, Node 24.9 or later
+npm install -g @deepseek-ai/dsh pnpm
 dsh plugin --profile web add @vllm-sr/dsh
 dsh web
 ```
 
-The package can also come straight from GitHub: `dsh plugin --profile web add github:Xunzhuo/dsh-system-one-plugin`.
+The first line installs DeepSeek Harness (0.2.1-rc.5 or a later 0.2 release, on Node 24.9 or later) and pnpm, which
+`dsh plugin` uses to install plugins; without pnpm, `dsh plugin add` stops with "pnpm was not found". On a machine
+with git, the package can also come straight from GitHub: `dsh plugin --profile web add github:Xunzhuo/dsh-system-one-plugin`.
 
-On its first start the plugin gets one free System Duo key, with the same small proof of work the site's "Get your
-API key" button runs in the browser, and saves it in DeepSeek Harness's credential store and in `~/.dsh/.env` (readable
-by you only). A notice in the session says so. `vllm-sr/auto` becomes the default model; choose another model
+On its first start the plugin gets a free System Duo key, with the same small proof of work the site's "Get your API
+key" button runs in the browser, and saves it in DeepSeek Harness's credential store and in `~/.dsh/.env` (readable
+by you only). A line under your first request says so: "Free API key created for app.vllm-sr.ai, saved in
+~/.dsh/.env", or why the site refused one. `vllm-sr/auto` becomes the default model; choose another model
 in the app and System One keeps working beside it.
 
 Headless:
@@ -69,15 +71,55 @@ badge that carries the decision's latency:
 - **Done-check**: a card after the answer: done, waiting on you, or sent back to finish.
 - **`system_one` tool**: its row shows the batch: items, questions, each question's answer distribution and the
   results file.
+- **Free key**: a **System Duo** line under your first request when the plugin created a key, or could not.
 
 Routine checks (an allowed call, a clean result) are one line and fold with the turn's work. Cards stay visible when
 the work folds, so a finished turn still shows what System One decided. Parallel calls in one step share one line or
 card, and every decision pops in with a short animation the first time it appears (none with reduced motion). Each
-element shows the Decision API's own answer: the probabilities, the model and the measured latency.
+element shows the Decision API's own answer: the probabilities, the model (in bold, as `vllm-sr/d3-ultra`) and the
+measured latency.
 
-Every element carries `data-system-one` (`card`, `compact` or `tool`), `data-system-one-reflex` (`triage`, `guard`,
-`shield`, `done` or `tool`) and `data-system-one-verdict`, for tests and screen recordings. Set `systemOneUi` to
-`compact` for one line per decision, or to `off` to hide them.
+Set `systemOneUi` to `compact` for one line per decision, or to `off` to hide them.
+
+### Selectors
+
+For tests and screen recordings, each System One element in Chat is one root marked `data-system-one`, with stable
+attributes that say what it shows:
+
+| Attribute | Values |
+| --- | --- |
+| `data-system-one` | `card`, `compact` (one line), `tool` (the `system_one` row) or `notice` (the free-key line) |
+| `data-system-one-reflex` | `triage`, `guard`, `shield`, `done`, `tool` or `key` |
+| `data-system-one-verdict` | triage `brief`; guard `allow`, `ask` or `deny`; shield `clean`, `removed` or `flagged`; done-check `stop` or `continue`; tool `running` or `done`; key `created` or `failed`; `error` when System One did not answer |
+| `data-system-one-outcome` | guard, once you answer its approval: `allowed`, `rejected`, `cancelled` or `failed` |
+| `data-system-one-why` | done-check: `complete`, `waiting`, `unfinished` or `unchecked` |
+| `data-system-one-tone` | its colour: `ok` (green), `info` (ember), `warn` (amber), `bad` (red) or `muted` |
+| `data-system-one-count` | how many decisions it holds (a batch: how many items) |
+| `data-system-one-turn`, `data-system-one-step` | where it acted (the step for guard and shield) |
+| `data-system-one-model` | the model that answered, as `vllm-sr/d3-ultra` |
+
+Inside a root, `data-system-one-part` marks `badge` (the ember **System One** pill), `latency`, `reflex`, `summary`,
+`model`, `head`, `toggle` (the button of a one-line element), `rows`, `verdict`, `outcome`, `subject`, `facts`,
+`note` and `more`, in the batch row also `stack`, `legend`, `failed`, `results` and `raw`, and in the free-key line
+`badge` (the **System Duo** pill), `summary` and `links`. Each number is a
+`data-system-one-fact`: `kind`, `effort`, `unclear` and `risky` (triage), `risk`, `leaks` and `on-task` (guard),
+`passages` and `injection` (shield), `complete`, `checked` and `waiting` (done-check). Decision rows carry
+`data-system-one-decision` and `data-system-one-call`, batch questions `data-system-one-question`. For example:
+
+| Element | Selector |
+| --- | --- |
+| Triage card | `[data-system-one-reflex="triage"]` |
+| Guard card that asked you (amber) | `[data-system-one-reflex="guard"][data-system-one-verdict="ask"]` |
+| The same card once you rejected the call (red) | `[data-system-one-reflex="guard"][data-system-one-outcome="rejected"]` |
+| Injection removed (red) | `[data-system-one-reflex="shield"][data-system-one-verdict="removed"]` |
+| A routine check (one line) | `[data-system-one="compact"][data-system-one-reflex="guard"]`, and `"shield"` |
+| Done-check | `[data-system-one-reflex="done"]` |
+| Batch row, finished | `[data-system-one="tool"][data-system-one-verdict="done"]` |
+| The ember badge, and its latency | `[data-system-one-part="badge"]`, `[data-system-one-part="latency"]` |
+| "Dangerous", and "You rejected it" | `[data-system-one-fact="risk"]`, `[data-system-one-part="outcome"]` |
+| The reason | `[data-system-one-part="note"]` |
+| The model's name (bold) | `[data-system-one-part="model"]` |
+| Free key created | `[data-system-one="notice"][data-system-one-verdict="created"]` |
 
 ## Your data
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vllm-sr/dsh",
-  "version": "0.4.0",
-  "description": "System Duo for DeepSeek Harness. Thinking, fast and slow. One key: System One decision models guard, shield, triage and check your agent around System Two (vllm-sr/auto), with one free app.vllm-sr.ai key.",
+  "version": "0.4.2",
+  "description": "System Duo for DeepSeek Harness. Thinking, fast and slow: System One decision models guard, shield, triage and check your agent around System Two (vllm-sr/auto), with a free app.vllm-sr.ai key.",
   "keywords": [
     "deepseek-harness",
     "dsh",

package/src/index.js

@@ -9,7 +9,7 @@
  * - done:   agent/turn-stopping  is the work really finished and checked?
  * - tool:   system_one           one rubric over many items, for the LLM to call
  *
- * On first use it gets one free System Duo key (app.vllm-sr.ai) for vllm-sr/auto and the decision models (keys.js).
+ * On first use it gets a free System Duo key (app.vllm-sr.ai) for vllm-sr/auto and the decision models (keys.js).
  * Each decision is also recorded in the session (records.js), and the browser half (web/client.js) draws it in Chat.
  */
 import { homedir } from 'node:os'
@@ -19,9 +19,9 @@ import z from '@deepseek-ai/schemastery'
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import * as dshSession from '@deepseek-ai/dsh-session'
 import { createDecisionClient, compactAnswer, yes } from './client.js'
-import { SERVICES, appendDotenv, ensureKeys, readDotenv } from './keys.js'
+import { SERVICES, appendDotenv, describeKeys, ensureKeys, readDotenv } from './keys.js'
 import { DONE, EFFORT_LEVELS, GUARD, RISK_LEVELS, TRIAGE } from './questions.js'
-import { UI_MODES, approvalOutcome, createRecorder, subject } from './records.js'
+import { UI_MODES, approvalOutcome, createRecorder, relativeTo, subject } from './records.js'
 import { screen } from './shield.js'
 import { systemOneTool } from './tool.js'
 import { clip, createTrace } from './trace.js'
@@ -125,7 +125,9 @@ function briefCall(exec) {
 export function apply(ctx, config) {
   let credentials
   let keysReady
+  let keysSettled = false
   let keysNotice
+  let keysRecord
   const keysAbort = new AbortController()
   // DeepSeek Harness's user dotenv: the credential store falls back to it, and a headless run reads it at launch
   const envFile = join(process.env.DSH_HOME || join(homedir(), '.dsh'), '.env')
@@ -161,7 +163,7 @@ export function apply(ctx, config) {
     if (!id) return undefined
     let state = sessions.get(id)
     if (!state) {
-      state = { id, user: '', calls: [], assistant: '', steers: 0, triage: undefined, turn: 0, step: 0, asked: new Map(), pendingTriage: undefined }
+      state = { id, user: '', calls: [], assistant: '', steers: 0, triage: undefined, turn: 0, step: 0, asked: new Map(), pendingTriage: undefined, pendingKey: undefined }
       sessions.set(id, state)
     }
     return state
@@ -192,24 +194,15 @@ export function apply(ctx, config) {
       return ensureKeys({ resolve, store: keep, services, label: config.keyLabel, signal: keysAbort.signal })
     })().then(({ allocated, failed }) => {
       trace({ ev: 'keys', store: Boolean(store), allocated: allocated.map(s => s.site), failed: failed.map(f => ({ site: f.service.site, code: f.error.code, message: clip(String(f.error.message), 200) })) })
-      const lines = []
-      if (allocated.length) {
-        const saved = store ? `DeepSeek Harness's credential store and ${where}` : `${where}`
-        const later = !store ? ' A headless run reads keys when it starts, so vllm-sr/auto answers from the next run.' : ''
-        const s = allocated[0]
-        lines.push(`[System Duo] One free key for vllm-sr/auto and the decision models (${new URL(s.site).host}) is saved in ${saved}. Using it accepts the terms (${s.terms}); requests are logged to improve the services and to train models (${s.privacy}).${later}`)
-      }
-      for (const { service, error } of failed) {
-        if (keysAbort.signal.aborted) continue
-        // a DOMException's code is a legacy number (20 for an abort, 23 for a timeout); its name says what happened
-        const why = typeof error.code === 'number' ? error.name : error.code ?? error.status ?? 'error'
-        lines.push(`[System Duo] No free key from ${new URL(service.site).host} (${why}: ${clip(String(error.message), 160)}). Get one at ${service.site} and save it as ${service.ref}.`)
-      }
-      if (lines.length === 0) return
-      if (!store) process.stderr.write(`${lines.join('\n')}\n`)
-      keysNotice = notice(lines.join('\n'), allocated.length ? 'System Duo got a free key for vllm-sr/auto and the decision models' : 'System Duo could not get a free key')
+      const said = describeKeys({ allocated, failed: keysAbort.signal.aborted ? [] : failed }, { file: where, store: Boolean(store) })
+      if (!said) return
+      if (!store) process.stderr.write(`${said.text}\n`)
+      keysNotice = notice(said.text, said.summary)
+      keysRecord = said.record
     }, error => {
       trace({ ev: 'keys', error: clip(String(error?.message ?? error), 300) })
+    }).finally(() => {
+      keysSettled = true
     })
   }
 
@@ -222,10 +215,13 @@ export function apply(ctx, config) {
     startKeys(scoped.credentials)
   })
 
-  function withNotices(decision, messages) {
+  // Chat hides notices, so the keys' one also goes to the session as a record that Chat draws under the request.
+  function withNotices(decision, messages, state, agent) {
     if (decision.kind !== 'enter') return decision
     const extra = [keysNotice, ...messages].filter(Boolean)
+    if (keysNotice && keysRecord && state && agent?.session) state.pendingKey = { session: agent.session, data: { ...keysRecord, turn: state.turn, step: state.step } }
     keysNotice = undefined
+    keysRecord = undefined
     return extra.length === 0 ? decision : { ...decision, messages: [...decision.messages, ...extra] }
   }
 
@@ -254,10 +250,11 @@ export function apply(ctx, config) {
   const AFTER_REQUEST = new Set(['request/header', 'request/context', 'assistant/message', 'step/end', 'turn/end'])
   ctx.on('session/event', (session, event) => {
     const state = sessions.get(session?.id)
-    const pending = state?.pendingTriage
-    if (pending && ((event?.type === 'user/message' && event.data?.source?.kind === 'user') || AFTER_REQUEST.has(event?.type))) {
+    const pending = [state?.pendingKey, state?.pendingTriage].filter(Boolean)
+    if (pending.length && ((event?.type === 'user/message' && event.data?.source?.kind === 'user') || AFTER_REQUEST.has(event?.type))) {
+      state.pendingKey = undefined
       state.pendingTriage = undefined
-      queueMicrotask(() => record(pending.session, pending.data))
+      queueMicrotask(() => pending.forEach(entry => record(entry.session, entry.data)))
     }
     if (event?.type !== 'assistant/message') return
     const text = textOf(event.data?.message?.content)
@@ -289,7 +286,7 @@ export function apply(ctx, config) {
   // Triage: one look at each new user request before the model sees it.
   ctx.on('agent/pre-step', async (payload, next) => {
     if (!keysReady && !credentials) startKeys(undefined)
-    if (keysReady) await Promise.race([keysReady, sleep(KEYS_WAIT_MS)])
+    if (keysReady && !keysSettled) await Promise.race([keysReady, sleep(KEYS_WAIT_MS, undefined, { ref: false })])
     const { agent, messages, signal, turn, step } = payload
     const userMessages = messages.filter(message => message.source?.kind === 'user')
     const state = sessionState(agent)
@@ -302,7 +299,7 @@ export function apply(ctx, config) {
     state.calls = []
     state.steers = 0
     trace({ ev: 'user', session: state.id, turn, text: clip(state.user, 4000) })
-    if (!config.triage || !state.user) return withNotices(await next(), [])
+    if (!config.triage || !state.user) return withNotices(await next(), [], state, agent)
     let brief
     try {
       const response = await client.ask({ model: config.model, questions: TRIAGE, inputs: [{ state: clip(state.user, 12000) }], signal, timeoutMs: config.hookTimeoutMs, retries: config.hookRetries })
@@ -326,7 +323,7 @@ export function apply(ctx, config) {
       trace({ ev: 's1', reflex: 'triage', session: state.id, turn, error: String(error?.message ?? error) })
       if (!signal?.aborted) state.pendingTriage = { session: agent.session, data: { reflex: 'triage', turn, step, error: subject(error?.message ?? error) } }
     }
-    return withNotices(await next(), [brief])
+    return withNotices(await next(), [brief], state, agent)
   })
 
   // Guard: every side-effecting call is reviewed before it runs.
@@ -335,12 +332,13 @@ export function apply(ctx, config) {
     ctx.on('tools/pre-execute', async (exec, next) => {
       if (!gated.has(exec.name) || !exec.agent) return next()
       const state = sessionState(exec.agent)
+      const workspace = await workspaceOf(exec)
       const situation = [
         `The user asked the agent:\n"""${clip(state?.user || '(unknown)', 1500)}"""`,
-        `Workspace: ${await workspaceOf(exec)}`,
+        `Workspace: ${workspace}`,
         `The agent now wants to run:\n${describeCall(exec)}`,
       ].join('\n\n')
-      const base = { reflex: 'guard', turn: state?.turn, step: state?.step, callId: exec.callId, tool: exec.name, call: subject(briefCall(exec)) }
+      const base = { reflex: 'guard', turn: state?.turn, step: state?.step, callId: exec.callId, tool: exec.name, call: subject(relativeTo(briefCall(exec), workspace, homedir())) }
       let response
       try {
         response = await client.ask({ model: config.model, questions: GUARD, inputs: [{ state: situation }], signal: exec.signal, timeoutMs: config.hookTimeoutMs, retries: config.hookRetries })
@@ -414,7 +412,7 @@ export function apply(ctx, config) {
       const tail = text.slice(screened.length)
       const where = exec.name === 'web_fetch' ? `a web page (${exec.arguments?.url})` : exec.name === 'read' ? `the file ${exec.arguments?.file_path}` : `the output of: ${clip(exec.arguments?.command, 200)}`
       const prefix = `The user asked the agent: "${clip(state?.user || '(unknown)', 300)}"\nThe agent just read this passage from ${where}:`
-      const base = { reflex: 'shield', turn: state?.turn, step: state?.step, callId: exec.callId, tool: exec.name, call: subject(briefCall(exec)) }
+      const base = { reflex: 'shield', turn: state?.turn, step: state?.step, callId: exec.callId, tool: exec.name, call: subject(relativeTo(briefCall(exec), await workspaceOf(exec), homedir())) }
       const started = performance.now()
       let verdict
       try {

package/src/keys.js

@@ -1,7 +1,7 @@
 /**
- * The free System Duo key (app.vllm-sr.ai): one key for both vllm-sr/auto, the LLM (System Two), and the
- * decision models (System One). The site hands it out for a small proof of work, the same one its "Get your API
- * key" button runs in the browser; the key is kept in DeepSeek Harness's credential store.
+ * The free System Duo key (app.vllm-sr.ai), which both vllm-sr/auto, the LLM (System Two), and the decision models
+ * (System One) take. The site hands it out for a small proof of work, the same one its "Get your API key" button runs
+ * in the browser; the key is kept in DeepSeek Harness's credential store.
  */
 import { createHash, hash as oneShot } from 'node:crypto'
 import { closeSync, fchmodSync, mkdirSync, openSync, readFileSync, writeSync } from 'node:fs'
@@ -172,3 +172,40 @@ export async function ensureKeys({ resolve, store, services = SERVICES, label, f
   }))
   return { allocated, failed }
 }
+
+/**
+ * What the session says about the keys a start fetched: the notice the model reads (and Trajectory shows), and the
+ * record Chat draws as an inline line.
+ * @param {object} outcome - ensureKeys' result
+ * @param {object} where
+ * @param {string} where.file - the dotenv file the key went to, as the user writes it (~/.dsh/.env)
+ * @param {boolean} where.store - whether DeepSeek Harness's credential store holds it too
+ * @returns {{text: string, summary: string, record: object} | undefined} nothing when no key was fetched or refused
+ */
+export function describeKeys({ allocated, failed }, { file, store }) {
+  const host = site => new URL(site).host
+  const lines = []
+  if (allocated.length) {
+    const s = allocated[0]
+    const saved = store ? `DeepSeek Harness's credential store and ${file}` : file
+    const later = store ? '' : ' A headless run reads keys when it starts, so vllm-sr/auto answers from the next run.'
+    lines.push(`[System Duo] Free API key created for ${host(s.site)}, saved in ${saved}. Using it accepts the terms (${s.terms}); requests are logged to improve the services and to train models (${s.privacy}).${later}`)
+  }
+  const refused = failed.map(({ service, error }) => {
+    // a DOMException's code is a legacy number (20 for an abort, 23 for a timeout); its name says what happened
+    const why = typeof error.code === 'number' ? error.name : error.code ?? error.status ?? 'error'
+    const message = String(error.message).slice(0, 160)
+    lines.push(`[System Duo] No free API key from ${host(service.site)} (${why}: ${message}). Get one at ${service.site} and save it as ${service.ref}.`)
+    return { service, why, message }
+  })
+  if (lines.length === 0) return undefined
+  const s = allocated[0]
+  const record = s
+    ? { reflex: 'key', verdict: 'created', site: host(s.site), saved: file, store, terms: s.terms, privacy: s.privacy }
+    : { reflex: 'key', verdict: 'failed', site: host(refused[0].service.site), url: refused[0].service.site, ref: refused[0].service.ref, error: { code: String(refused[0].why), message: refused[0].message } }
+  return {
+    text: lines.join('\n'),
+    summary: s ? `Free API key created for ${host(s.site)}` : `No free API key from ${host(refused[0].service.site)}`,
+    record,
+  }
+}

package/src/records.js

@@ -20,6 +20,28 @@ export function subject(text, max = 200) {
   return redact(clip(text, max))
 }
 
+const escaped = text => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+// a path starts after a separator and ends at one, so /work does not match inside /work2 or /x/work
+const START = String.raw`(?<=^|[\s'"=:(])`
+const END = String.raw`(?=$|[\s'"/;&|)<>,])`
+
+/**
+ * A call as the cards show it: paths in the session's working directory relative to it, the home directory as `~`,
+ * and no leading `cd` into the working directory itself.
+ */
+export function relativeTo(text, workspace, home) {
+  let out = String(text ?? '')
+  const root = dir => (typeof dir === 'string' && dir.replace(/\/+$/, '').length > 1 ? escaped(dir.replace(/\/+$/, '')) : undefined)
+  const work = root(workspace)
+  if (work) {
+    out = out.replace(new RegExp(`${START}${work}/`, 'g'), '').replace(new RegExp(`${START}${work}${END}`, 'g'), '.')
+    out = out.replace(/^cd \.\s*&&\s*/, '')
+  }
+  const own = root(home)
+  if (own) out = out.replace(new RegExp(`${START}${own}${END}`, 'g'), '~')
+  return out
+}
+
 /**
  * @param {object} options
  * @param {((session: object, type: string, data: object) => unknown) | undefined} options.append - DeepSeek

package/src/tool.js

@@ -12,20 +12,38 @@ You write the rubric as questions; System One answers every question for every i
 
 Question types:
 - "choice": pick one option. criteria: an object of option name -> short description (2 or more options).
-- "noul": yes or no. The answer is the probability of yes.
+- "noul": yes or no, with no criteria: say in the instructions what counts as yes. The answer is the probability of yes.
 - "score": an ordered scale. criteria: a list of level descriptions, lowest first (2 to 10). The answer is the expected level (0 = first).
 - "box": where something is in an image (images only); instructions name the target.
 
 Example questions: {"team": {"type": "choice", "instructions": "Which team should handle this ticket?", "criteria": {"billing": "Payments, invoices, refunds", "engineering": "Bugs, errors, outages", "sales": "Plans and pricing"}}, "urgency": {"type": "score", "instructions": "How urgent is this ticket?", "criteria": ["Low", "Normal", "Urgent"]}, "angry": {"type": "noul", "instructions": "Is the customer angry?"}}`
 
-function parseQuestions(value) {
+/** The type a question's criteria imply: a list of levels is a score, named options a choice, anything else yes/no. */
+function impliedType(criteria) {
+  if (Array.isArray(criteria)) return 'score'
+  if (!criteria || typeof criteria !== 'object') return 'noul'
+  return Object.keys(criteria).map(name => name.toLowerCase()).sort().join() === 'no,yes' ? 'noul' : 'choice'
+}
+
+export function parseQuestions(value) {
   const questions = typeof value === 'string' ? JSON.parse(value) : value
   if (!questions || typeof questions !== 'object' || Array.isArray(questions) || Object.keys(questions).length === 0) {
     throw new Error('questions must be an object of question id -> {type, instructions, criteria}')
   }
-  for (const [id, question] of Object.entries(questions)) {
+  for (const [id, asked] of Object.entries(questions)) {
+    // System Two often leaves the type out of its first call
+    const question = asked && typeof asked === 'object' && asked.type === undefined ? { ...asked, type: impliedType(asked.criteria) } : asked
+    questions[id] = question
     if (!['choice', 'noul', 'score', 'box'].includes(question?.type)) throw new Error(`question "${id}" needs type choice, noul, score or box`)
     if (typeof question.instructions !== 'string' || !question.instructions.trim()) throw new Error(`question "${id}" needs instructions`)
+    // the Decision API does not answer a noul question that carries criteria
+    if (question.type === 'noul' && question.criteria !== undefined) {
+      const { criteria, ...rest } = question
+      const rules = typeof criteria === 'string' ? [criteria]
+        : Array.isArray(criteria) ? criteria.map(String)
+          : criteria && typeof criteria === 'object' ? Object.entries(criteria).map(([name, rule]) => `${name}: ${rule}`) : []
+      questions[id] = { ...rest, instructions: [rest.instructions.trim(), ...rules].join('\n') }
+    }
   }
   return questions
 }

package/web/client.js

@@ -64,7 +64,8 @@ window.__ModuleLoader__.load({
       const num = value => (typeof value === 'number' && Number.isFinite(value) ? value : undefined)
       const p2 = value => (num(value) === undefined ? '?' : value.toFixed(2))
       const secs = ms => (num(ms) === undefined ? '' : `${(ms / 1000).toFixed(2)} s`)
-      const shortModel = model => (typeof model === 'string' ? model.replace(/^vllm-sr\//, '') : '')
+      // System One's models are vllm-sr's; the name always shows its owner, whatever form the answer gave it in
+      const fullModel = model => (typeof model === 'string' && model ? (model.includes('/') ? model : `vllm-sr/${model}`) : '')
       const plural = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`
       const clamp01 = value => Math.min(1, Math.max(0, value))
       const level = (labels, score) => labels[Math.min(labels.length - 1, Math.max(0, Math.round(score)))]
@@ -171,10 +172,10 @@ window.__ModuleLoader__.load({
           verdict: 'brief', label: kindLabel, short: kindLabel.toLowerCase(), tone: 'info',
           headline: [`${kindLabel} work`, `${effortLabel.toLowerCase()} effort`, ...flags].join(' · '),
           facts: [
-            { label: 'Kind', value: `${kindLabel} ${p2(confidence)}`, bar: confidence },
-            { label: 'Effort', value: effort === undefined ? '?' : `${effortLabel} · ${effort.toFixed(1)} of 3`, bar: effort === undefined ? undefined : effort / 3 },
-            { label: 'Unclear', value: p2(unclear), bar: unclear, tone: unclear >= 0.6 ? 'warn' : undefined },
-            { label: 'Risky', value: p2(risky), bar: risky, tone: risky >= 0.5 ? 'bad' : undefined },
+            { id: 'kind', label: 'Kind', value: `${kindLabel} ${p2(confidence)}`, bar: confidence },
+            { id: 'effort', label: 'Effort', value: effort === undefined ? '?' : `${effortLabel} · ${effort.toFixed(1)} of 3`, bar: effort === undefined ? undefined : effort / 3 },
+            { id: 'unclear', label: 'Unclear', value: p2(unclear), bar: unclear, tone: unclear >= 0.6 ? 'warn' : undefined },
+            { id: 'risky', label: 'Risky', value: p2(risky), bar: risky, tone: risky >= 0.5 ? 'bad' : undefined },
           ],
           note: hints.length ? `Brief for System Two: ${hints.join(' ')}` : undefined,
         }
@@ -184,21 +185,21 @@ window.__ModuleLoader__.load({
         const outcome = OUTCOME[row.outcome]
         if (row.error) {
           const fallback = { allow: { text: 'so the call ran', tone: 'muted' }, ask: { text: 'so you were asked', tone: 'warn' }, deny: { text: 'so the call was blocked', tone: 'bad' } }[row.verdict]
-          return { ...errorView(row, fallback), outcome }
+          return { ...errorView(row, fallback), outcome, outcomeKey: outcome ? row.outcome : undefined }
         }
         const subject = { tool: row.tool, text: row.call }
         const verdict = GUARD[row.verdict]
-        if (!verdict) return { verdict: row.outcome ?? 'unknown', ...(outcome ?? { label: 'Reviewed', short: 'reviewed', tone: 'muted' }), subject, facts: [] }
+        if (!verdict) return { verdict: row.outcome ?? 'unknown', ...(outcome ?? { label: 'Reviewed', short: 'reviewed', tone: 'muted' }), outcomeKey: outcome ? row.outcome : undefined, subject, facts: [] }
         const a = row.answers ?? {}
         const risk = scoreOf(a.risk)
         const leaks = yesOf(a.exfiltration)
         const onTask = yesOf(a.on_task)
         const facts = []
-        if (risk !== undefined) facts.push({ label: 'Risk', value: `${level(RISK, Math.min(3, risk))} · ${risk.toFixed(2)} of 3`, bar: risk / 3, tone: risk >= 2.5 ? 'bad' : risk >= 1.8 ? 'warn' : 'ok' })
-        if (leaks !== undefined) facts.push({ label: 'Leaks secrets', value: p2(leaks), bar: leaks, tone: leaks >= 0.7 ? 'bad' : undefined })
-        if (onTask !== undefined) facts.push({ label: 'On task', value: p2(onTask), bar: onTask, tone: onTask < 0.15 ? 'warn' : undefined })
+        if (risk !== undefined) facts.push({ id: 'risk', label: 'Risk', value: `${level(RISK, Math.min(3, risk))} · ${risk.toFixed(2)} of 3`, bar: risk / 3, tone: risk >= 2.5 ? 'bad' : risk >= 1.8 ? 'warn' : 'ok' })
+        if (leaks !== undefined) facts.push({ id: 'leaks', label: 'Leaks secrets', value: p2(leaks), bar: leaks, tone: leaks >= 0.7 ? 'bad' : undefined })
+        if (onTask !== undefined) facts.push({ id: 'on-task', label: 'On task', value: p2(onTask), bar: onTask, tone: onTask < 0.15 ? 'warn' : undefined })
         return {
-          verdict: row.verdict, ...verdict, subject, facts, outcome, verdictTone: verdict.tone,
+          verdict: row.verdict, ...verdict, subject, facts, outcome, outcomeKey: outcome ? row.outcome : undefined, verdictTone: verdict.tone,
           tone: outcome && SEVERITY[outcome.tone] > SEVERITY[verdict.tone] ? outcome.tone : verdict.tone,
           note: row.verdict !== 'allow' && row.why ? `Because ${row.why}.` : undefined,
         }
@@ -211,8 +212,8 @@ window.__ModuleLoader__.load({
         return {
           verdict: row.verdict, ...verdict, subject: { tool: row.tool, text: row.call },
           facts: [
-            { label: 'Passages', value: String(num(row.passages) ?? '?') },
-            { label: 'Injection', value: p2(row.maxP), bar: num(row.maxP), tone: row.maxP >= 0.5 ? 'bad' : 'ok' },
+            { id: 'passages', label: 'Passages', value: String(num(row.passages) ?? '?') },
+            { id: 'injection', label: 'Injection', value: p2(row.maxP), bar: num(row.maxP), tone: row.maxP >= 0.5 ? 'bad' : 'ok' },
           ],
           note: row.verdict === 'removed' ? `Removed ${plural(lines, 'line')} that gave orders to AI agents before System Two read the result.`
             : row.verdict === 'flagged' ? `Found ${plural(lines, 'line')} that give orders to AI agents; the result was withheld.` : undefined,
@@ -226,12 +227,12 @@ window.__ModuleLoader__.load({
         const verdict = DONE[why]
         const round = `${num(row.steers) ?? '?'} of ${num(row.maxSteers) ?? '?'}`
         return {
-          verdict: row.verdict === 'continue' ? 'continue' : 'stop', ...verdict, short: verdict.label.toLowerCase(),
+          verdict: row.verdict === 'continue' ? 'continue' : 'stop', ...verdict, why, short: verdict.label.toLowerCase(),
           headline: row.verdict === 'continue' ? `${verdict.label} to System Two (${round})` : why === 'waiting' ? 'Waiting on you' : 'The work is done',
           facts: [
-            { label: 'Complete', value: p2(yesOf(a.complete)), bar: yesOf(a.complete), tone: yesOf(a.complete) < 0.5 ? 'warn' : 'ok' },
-            { label: 'Checked', value: p2(yesOf(a.checked)), bar: yesOf(a.checked) },
-            { label: 'Waiting on you', value: p2(yesOf(a.waiting)), bar: yesOf(a.waiting) },
+            { id: 'complete', label: 'Complete', value: p2(yesOf(a.complete)), bar: yesOf(a.complete), tone: yesOf(a.complete) < 0.5 ? 'warn' : 'ok' },
+            { id: 'checked', label: 'Checked', value: p2(yesOf(a.checked)), bar: yesOf(a.checked) },
+            { id: 'waiting', label: 'Waiting on you', value: p2(yesOf(a.waiting)), bar: yesOf(a.waiting) },
           ],
           note: why === 'unfinished' ? `Not finished yet, so System Two goes back to work (${round}).`
             : why === 'unchecked' ? `The changes were not checked, so System Two goes back to verify them (${round}).` : undefined,
@@ -273,7 +274,7 @@ window.__ModuleLoader__.load({
         const label = view.outcome ? `${view.label} → ${view.outcome.label}` : view.label
         const rest = []
         if (view.subject?.text) rest.push(`${view.subject.tool ?? ''} ${view.subject.text}`.trim())
-        const lead = view.facts.find(fact => fact.label === 'Risk' || fact.label === 'Injection' || fact.label === 'Complete' || fact.label === 'Effort')
+        const lead = view.facts.find(fact => ['risk', 'injection', 'complete', 'effort'].includes(fact.id))
         if (lead) rest.push(`${lead.label.toLowerCase()} ${lead.value}`)
         if (view.error) rest.push(view.error)
         return { label, tone: view.tone, rest: rest.join(' · ') }
@@ -313,18 +314,23 @@ window.__ModuleLoader__.load({
 
       function Badge({ id, ms, time }) {
         const fresh = useFresh(`badge:${id}`, time)
-        return h('span', { className: cx('vsr-s1__badge', fresh && 'vsr-s1__badge--fresh') },
+        return h('span', { className: cx('vsr-s1__badge', fresh && 'vsr-s1__badge--fresh'), 'data-system-one-part': 'badge' },
           h('i', { className: 'vsr-s1__dot', 'aria-hidden': true }),
           h('span', { className: 'vsr-s1__name' }, 'System One'),
-          secs(ms) ? h('span', { className: 'vsr-s1__ms' }, secs(ms)) : null)
+          secs(ms) ? h('span', { className: 'vsr-s1__ms', 'data-system-one-part': 'latency' }, secs(ms)) : null)
       }
 
-      function Pill({ tone, children, arrow }) {
-        return h('span', { className: cx('vsr-s1__pill', `vsr-s1__pill--${tone}`, arrow && 'vsr-s1__pill--then') }, children)
+      function Model({ model }) {
+        const name = fullModel(model)
+        return name ? h('b', { className: 'vsr-s1__model', 'data-system-one-part': 'model', title: name }, name) : null
       }
 
-      function Fact({ label, value, bar, tone }) {
-        return h('span', { className: 'vsr-s1__fact' },
+      function Pill({ tone, children, arrow, part }) {
+        return h('span', { className: cx('vsr-s1__pill', `vsr-s1__pill--${tone}`, arrow && 'vsr-s1__pill--then'), 'data-system-one-part': part }, children)
+      }
+
+      function Fact({ id, label, value, bar, tone }) {
+        return h('span', { className: 'vsr-s1__fact', 'data-system-one-fact': id },
           h('span', { className: 'vsr-s1__fact-label' }, label),
           num(bar) === undefined ? null : h('span', { className: cx('vsr-s1__bar', tone && `vsr-s1__bar--${tone}`), style: { '--p': clamp01(bar) }, 'aria-hidden': true }, h('i')),
           h('b', null, value))
@@ -335,34 +341,44 @@ window.__ModuleLoader__.load({
         return h('div', {
           className: cx('vsr-s1__row', fresh && 'vsr-s1__row--fresh'),
           'data-system-one-decision': view.verdict,
+          'data-system-one-outcome': view.outcomeKey,
           'data-system-one-call': row.callId,
         },
         h('span', { className: 'vsr-s1__verdicts' },
-          h(Pill, { tone: view.verdictTone ?? view.tone }, view.label),
-          view.outcome ? h(Pill, { tone: view.outcome.tone, arrow: true }, view.outcome.label) : null),
+          h(Pill, { tone: view.verdictTone ?? view.tone, part: 'verdict' }, view.label),
+          view.outcome ? h(Pill, { tone: view.outcome.tone, arrow: true, part: 'outcome' }, view.outcome.label) : null),
         h('div', { className: 'vsr-s1__main' },
-          view.subject?.text ? h('div', { className: 'vsr-s1__subject' },
+          view.subject?.text ? h('div', { className: 'vsr-s1__subject', 'data-system-one-part': 'subject' },
             view.subject.tool ? h('span', { className: 'vsr-s1__tool' }, view.subject.tool) : null,
             h('code', { className: 'vsr-s1__code', title: view.subject.text }, view.subject.text)) : null,
-          view.facts.length ? h('div', { className: 'vsr-s1__facts' }, view.facts.map(fact => h(Fact, { key: fact.label, ...fact }))) : null,
-          view.note ? h('div', { className: 'vsr-s1__note' }, view.note) : null),
-        !single && secs(row.ms) ? h('span', { className: 'vsr-s1__rowms' }, secs(row.ms)) : null)
+          view.facts.length ? h('div', { className: 'vsr-s1__facts', 'data-system-one-part': 'facts' }, view.facts.map(fact => h(Fact, { key: fact.id, ...fact }))) : null,
+          view.note ? h('div', { className: 'vsr-s1__note', 'data-system-one-part': 'note' }, view.note) : null),
+        !single && secs(row.ms) ? h('span', { className: 'vsr-s1__rowms', 'data-system-one-part': 'latency' }, secs(row.ms)) : null)
       }
 
       function Rows({ reflex, rows, views }) {
         const [all, setAll] = React.useState(false)
         const hidden = all ? 0 : Math.max(0, rows.length - ROWS_SHOWN)
-        return h('div', { className: 'vsr-s1__rows' },
-          hidden > 0 ? h('button', { type: 'button', className: 'vsr-s1__more', onClick: () => setAll(true) }, `Show ${plural(hidden, `earlier ${reflex === 'guard' ? 'call' : 'result'}`)}`) : null,
+        return h('div', { className: 'vsr-s1__rows', 'data-system-one-part': 'rows' },
+          hidden > 0 ? h('button', { type: 'button', className: 'vsr-s1__more', 'data-system-one-part': 'more', onClick: () => setAll(true) }, `Show ${plural(hidden, `earlier ${reflex === 'guard' ? 'call' : 'result'}`)}`) : null,
           rows.slice(hidden).map((row, index) => h(Row, { key: idOf(row), row, view: views[hidden + index], single: rows.length === 1 })))
       }
 
-      function attributes(kind, state, views, worst) {
+      const whole = value => (Number.isSafeInteger(value) ? String(value) : undefined)
+
+      // a public contract (README.md, "Selectors"); React leaves out an attribute whose value is undefined
+      function attributes(kind, state, worst) {
         return {
           'data-system-one': kind,
           'data-system-one-reflex': state.reflex,
           'data-system-one-verdict': worst.verdict,
+          'data-system-one-outcome': worst.outcomeKey,
+          'data-system-one-why': worst.why,
+          'data-system-one-tone': worst.tone,
           'data-system-one-count': String(state.rows.length),
+          'data-system-one-turn': whole(state.rows[0].turn),
+          'data-system-one-step': state.reflex === 'guard' || state.reflex === 'shield' ? whole(state.rows[0].step) : undefined,
+          'data-system-one-model': fullModel(state.rows[state.rows.length - 1].model) || undefined,
         }
       }
 
@@ -377,14 +393,14 @@ window.__ModuleLoader__.load({
           className: cx('vsr-s1', 'vsr-s1--card', `vsr-s1--${worst.tone}`, fresh && 'vsr-s1--fresh'),
           role: 'group',
           'aria-label': `System One ${reflex}: ${headline}`,
-          ...attributes('card', state, views, worst),
+          ...attributes('card', state, worst),
         },
         h('span', { className: 'vsr-s1__sheen', 'aria-hidden': true }),
-        h('div', { className: 'vsr-s1__head' },
+        h('div', { className: 'vsr-s1__head', 'data-system-one-part': 'head' },
           h(Badge, { key: idOf(last), id: idOf(last), ms: last.ms, time: last.time }),
-          h('span', { className: 'vsr-s1__reflex' }, reflex),
-          h('span', { className: 'vsr-s1__summary', title: headline }, headline),
-          last.model ? h('span', { className: 'vsr-s1__model', title: last.model }, shortModel(last.model)) : null),
+          h('span', { className: 'vsr-s1__reflex', 'data-system-one-part': 'reflex' }, reflex),
+          h('span', { className: 'vsr-s1__summary', 'data-system-one-part': 'summary', title: headline }, headline),
+          h(Model, { model: last.model })),
         h(Rows, { reflex: state.reflex, rows: state.rows, views }))
       }
 
@@ -406,23 +422,56 @@ window.__ModuleLoader__.load({
           className: cx('vsr-s1', 'vsr-s1--compact', `vsr-s1--${worst.tone}`, open && 'vsr-s1--open', fresh && 'vsr-s1--fresh'),
           role: 'group',
           'aria-label': `System One ${reflex}: ${said}`,
-          ...attributes('compact', state, views, worst),
+          ...attributes('compact', state, worst),
         },
-        h('button', { type: 'button', className: 'vsr-s1__chip', 'aria-expanded': open, onClick: () => setOpen(!open) },
+        h('button', { type: 'button', className: 'vsr-s1__chip', 'data-system-one-part': 'toggle', 'aria-expanded': open, onClick: () => setOpen(!open) },
           h(Badge, { key: idOf(last), id: idOf(last), ms: last.ms, time: last.time }),
-          h('span', { className: 'vsr-s1__reflex' }, reflex),
-          h('span', { className: 'vsr-s1__summary', title: said },
-            h('span', { className: cx('vsr-s1__verdict', line.tone && `vsr-s1__verdict--${line.tone}`) }, line.label),
+          h('span', { className: 'vsr-s1__reflex', 'data-system-one-part': 'reflex' }, reflex),
+          h('span', { className: 'vsr-s1__summary', 'data-system-one-part': 'summary', title: said },
+            h('span', { className: cx('vsr-s1__verdict', line.tone && `vsr-s1__verdict--${line.tone}`), 'data-system-one-part': 'verdict' }, line.label),
             line.rest ? ` · ${line.rest}` : null),
+          open ? h(Model, { model: last.model }) : null,
           h(Chevron)),
         open ? h(Rows, { reflex: state.reflex, rows: state.rows, views }) : null)
       }
 
+      function KeyGlyph() {
+        return h('svg', { className: 'vsr-s1__glyph', viewBox: '0 0 16 16', width: 12, height: 12, 'aria-hidden': true },
+          h('circle', { cx: 5.5, cy: 8, r: 3, fill: 'none', stroke: 'currentColor', strokeWidth: 1.6 }),
+          h('path', { d: 'M8.5 8H14M12 8v2.5M14 8v2', fill: 'none', stroke: 'currentColor', strokeWidth: 1.6, strokeLinecap: 'round' }))
+      }
+
+      // The free key a start fetched, or why it could not: one line under the request, in either mode.
+      function KeyNotice({ state }) {
+        const row = state.rows[state.rows.length - 1]
+        const created = row.verdict === 'created'
+        const fresh = useFresh(`key:${idOf(row)}`, row.time)
+        const site = text(row.site) || 'app.vllm-sr.ai'
+        const said = created
+          ? `Free API key created for ${site}, saved in ${text(row.saved) || '~/.dsh/.env'}`
+          : `No free API key from ${site}: ${text(row.error?.message) || 'the site refused'}. Get one at ${site} and save it as ${text(row.ref) || 'VLLM_SR_API_KEY'}.`
+        const link = (href, label) => (typeof href === 'string' && /^https:\/\//.test(href) ? h('a', { className: 'vsr-s1__link', href, target: '_blank', rel: 'noreferrer' }, label) : null)
+        return h('div', {
+          className: cx('vsr-s1', 'vsr-s1--notice', created ? 'vsr-s1--ok' : 'vsr-s1--bad', fresh && 'vsr-s1--fresh'),
+          role: 'note',
+          'aria-label': `System Duo: ${said}`,
+          'data-system-one': 'notice',
+          'data-system-one-reflex': 'key',
+          'data-system-one-verdict': created ? 'created' : 'failed',
+          'data-system-one-tone': created ? 'ok' : 'bad',
+          'data-system-one-turn': whole(row.turn),
+        },
+        h('span', { className: cx('vsr-s1__duo', fresh && 'vsr-s1__badge--fresh'), 'data-system-one-part': 'badge' }, h(KeyGlyph), 'System Duo'),
+        h('span', { className: cx('vsr-s1__summary', !created && 'vsr-s1__summary--bad'), 'data-system-one-part': 'summary', title: said }, said),
+        created && (row.terms || row.privacy) ? h('span', { className: 'vsr-s1__links', 'data-system-one-part': 'links' }, link(row.terms, 'Terms'), link(row.privacy, 'Privacy')) : null)
+      }
+
       // A routine check (an allowed call, a clean result) is one line in either mode; a decision that changed
       // something, and the triage and done-check that frame the turn, are cards unless the mode is compact.
       function SystemOneNode(props) {
         const state = props?.node?.data
         if (!state || !Array.isArray(state.rows) || state.rows.length === 0) return null
+        if (state.reflex === 'key') return h(Contained, null, h(KeyNotice, { state }))
         const slim = state.ui === 'compact' || !standsOut(state)
         return h(Contained, null, h(slim ? Compact : Card, { state }))
       }
@@ -455,7 +504,7 @@ window.__ModuleLoader__.load({
 
       function Stack({ parts, fresh }) {
         const total = parts.reduce((sum, part) => sum + part.n, 0)
-        return h('span', { className: cx('vsr-s1__stack', fresh && 'vsr-s1__stack--fresh'), 'aria-hidden': true },
+        return h('span', { className: cx('vsr-s1__stack', fresh && 'vsr-s1__stack--fresh'), 'data-system-one-part': 'stack', 'aria-hidden': true },
           total > 0 ? parts.filter(part => part.n > 0).map((part, index) => h('i', { key: part.label, style: { flexGrow: part.n, background: part.color, animationDelay: `${0.12 + index * 0.06}s` } })) : null)
       }
 
@@ -463,12 +512,13 @@ window.__ModuleLoader__.load({
       const LABEL_CHARS = 28
       const shortLabel = label => (label.length > LABEL_CHARS ? `${label.slice(0, LABEL_CHARS - 1).trimEnd()}…` : label)
 
-      function Legend({ parts, extra }) {
-        return h('span', { className: 'vsr-s1__legend' },
+      function Legend({ parts, extra, failed }) {
+        return h('span', { className: 'vsr-s1__legend', 'data-system-one-part': 'legend' },
           parts.map(part => h('span', { key: part.label, className: 'vsr-s1__key', title: `${part.label}: ${part.n}` },
             h('i', { className: 'vsr-s1__swatch', style: { background: part.color } }),
             `${shortLabel(part.label)} `, h('b', null, String(part.n)))),
-          extra ? h('span', { className: 'vsr-s1__key vsr-s1__key--note' }, extra) : null)
+          extra ? h('span', { className: 'vsr-s1__key vsr-s1__key--note' }, extra) : null,
+          failed ? h('span', { className: 'vsr-s1__key vsr-s1__key--bad', 'data-system-one-part': 'failed' }, `${failed} failed`) : null)
       }
 
       function questionParts(summary) {
@@ -501,14 +551,14 @@ window.__ModuleLoader__.load({
           h('code', { className: 'vsr-s1__qname', title: id }, id),
           h('div', { className: 'vsr-s1__qbody' },
             parts.length ? h(Stack, { parts, fresh }) : null,
-            h(Legend, { parts, extra: [extra, summary?.failed ? `${summary.failed} failed` : undefined].filter(Boolean).join(' · ') || undefined })))
+            h(Legend, { parts, extra, failed: num(summary?.failed) || undefined })))
       }
 
       function ToolBody({ meta, fresh, cwd, openFile }) {
         const entries = Object.entries(meta.summary ?? {})
-        return h('div', { className: 'vsr-s1__rows' },
+        return h('div', { className: 'vsr-s1__rows', 'data-system-one-part': 'rows' },
           entries.map(([id, summary]) => h(Question, { key: id, id, summary, fresh })),
-          meta.output ? h('div', { className: 'vsr-s1__foot' },
+          meta.output ? h('div', { className: 'vsr-s1__foot', 'data-system-one-part': 'results' },
             'Results ',
             typeof openFile === 'function'
               ? h('button', { type: 'button', className: 'vsr-s1__link', onClick: () => openFile(meta.output) }, relative(meta.output, cwd))
@@ -524,36 +574,44 @@ window.__ModuleLoader__.load({
         const [open, setOpen] = React.useState(false)
         const source = args.file ? basename(args.file) : Array.isArray(args.images) ? plural(args.images.length, 'image') : Array.isArray(args.items) ? plural(args.items.length, 'item') : ''
         const asked = questionCount(args.questions)
-        const common = { 'data-system-one': 'tool', 'data-system-one-reflex': 'tool', 'data-system-one-call': callId }
+        const common = { 'data-system-one-reflex': 'tool', 'data-system-one-call': callId }
 
         if (phase !== 'result') {
           const line = phase === 'preparing' ? 'Preparing a batch' : `Answering ${plural(asked, 'question')}${source ? ` over ${source}` : ''}`
-          return h('div', { className: 'vsr-s1 vsr-s1--compact vsr-s1--running', ...common, 'data-system-one-verdict': 'running' },
+          return h('div', { className: 'vsr-s1 vsr-s1--compact vsr-s1--running', 'data-system-one': 'tool', ...common, 'data-system-one-verdict': 'running', 'data-system-one-tone': 'info' },
             h('div', { className: 'vsr-s1__chip vsr-s1__chip--static' },
               h(Badge, { id: `${callId}:running`, time: Date.now() }),
-              h('span', { className: 'vsr-s1__reflex' }, REFLEX.tool),
-              h('span', { className: 'vsr-s1__summary vsr-s1__shimmer' }, line)))
+              h('span', { className: 'vsr-s1__reflex', 'data-system-one-part': 'reflex' }, REFLEX.tool),
+              h('span', { className: 'vsr-s1__summary vsr-s1__shimmer', 'data-system-one-part': 'summary' }, line)))
         }
 
         if (block?.isError || !meta || ui === 'off') {
           const body = resultText(block)
           const first = body.split('\n')[0] || (block?.isError ? 'The batch failed' : 'Done')
-          return h('div', { className: cx('vsr-s1', 'vsr-s1--compact', 'vsr-s1--plain', block?.isError && 'vsr-s1--bad', open && 'vsr-s1--open'), ...common, 'data-system-one-verdict': block?.isError ? 'error' : 'done' },
-            h('button', { type: 'button', className: 'vsr-s1__chip', 'aria-expanded': open, onClick: () => setOpen(!open) },
-              h('span', { className: 'vsr-s1__reflex' }, 'System One'),
-              h('span', { className: cx('vsr-s1__summary', block?.isError && 'vsr-s1__summary--bad'), title: first }, first),
-              h(Chevron)),
-            open ? h('pre', { className: 'vsr-s1__raw' }, body) : null)
+          return h('div', {
+            className: cx('vsr-s1', 'vsr-s1--compact', 'vsr-s1--plain', block?.isError && 'vsr-s1--bad', open && 'vsr-s1--open'),
+            'data-system-one': 'tool', ...common, 'data-system-one-verdict': block?.isError ? 'error' : 'done', 'data-system-one-tone': block?.isError ? 'bad' : 'muted',
+          },
+          h('button', { type: 'button', className: 'vsr-s1__chip', 'data-system-one-part': 'toggle', 'aria-expanded': open, onClick: () => setOpen(!open) },
+            h('span', { className: 'vsr-s1__reflex', 'data-system-one-part': 'reflex' }, 'System One'),
+            h('span', { className: cx('vsr-s1__summary', block?.isError && 'vsr-s1__summary--bad'), 'data-system-one-part': 'summary', title: first }, first),
+            h(Chevron)),
+          open ? h('pre', { className: 'vsr-s1__raw', 'data-system-one-part': 'raw' }, body) : null)
         }
 
         const ms = num(meta.seconds) === undefined ? undefined : meta.seconds * 1000
         const headline = [plural(num(meta.items) ?? 0, 'item'), plural(num(meta.questions) ?? 0, 'question'), plural(num(meta.requests) ?? 0, 'request')].join(' · ')
+        const done = {
+          ...common, 'data-system-one-verdict': 'done', 'data-system-one-tone': 'ok', 'data-system-one-count': String(meta.items ?? ''),
+          'data-system-one-model': fullModel(meta.model) || undefined,
+        }
         if (ui === 'compact') {
-          return h('div', { className: cx('vsr-s1', 'vsr-s1--compact', 'vsr-s1--ok', open && 'vsr-s1--open', fresh && 'vsr-s1--fresh'), ...common, 'data-system-one-verdict': 'done', 'data-system-one-count': String(meta.items ?? '') },
-            h('button', { type: 'button', className: 'vsr-s1__chip', 'aria-expanded': open, onClick: () => setOpen(!open) },
+          return h('div', { className: cx('vsr-s1', 'vsr-s1--compact', 'vsr-s1--ok', open && 'vsr-s1--open', fresh && 'vsr-s1--fresh'), 'data-system-one': 'tool', ...done },
+            h('button', { type: 'button', className: 'vsr-s1__chip', 'data-system-one-part': 'toggle', 'aria-expanded': open, onClick: () => setOpen(!open) },
               h(Badge, { id: `${callId}:done`, ms, time: block?.time }),
-              h('span', { className: 'vsr-s1__reflex' }, REFLEX.tool),
-              h('span', { className: 'vsr-s1__summary', title: headline }, headline),
+              h('span', { className: 'vsr-s1__reflex', 'data-system-one-part': 'reflex' }, REFLEX.tool),
+              h('span', { className: 'vsr-s1__summary', 'data-system-one-part': 'summary', title: headline }, headline),
+              open ? h(Model, { model: meta.model }) : null,
               h(Chevron)),
             open ? h(ToolBody, { meta, fresh, cwd, openFile }) : null)
         }
@@ -561,16 +619,15 @@ window.__ModuleLoader__.load({
           className: cx('vsr-s1', 'vsr-s1--card', 'vsr-s1--ok', 'vsr-s1--tool', fresh && 'vsr-s1--fresh'),
           role: 'group',
           'aria-label': `System One batch: ${headline}`,
-          ...common,
-          'data-system-one-verdict': 'done',
-          'data-system-one-count': String(meta.items ?? ''),
+          'data-system-one': 'tool',
+          ...done,
         },
         h('span', { className: 'vsr-s1__sheen', 'aria-hidden': true }),
-        h('div', { className: 'vsr-s1__head' },
+        h('div', { className: 'vsr-s1__head', 'data-system-one-part': 'head' },
           h(Badge, { id: `${callId}:done`, ms, time: block?.time }),
-          h('span', { className: 'vsr-s1__reflex' }, REFLEX.tool),
-          h('span', { className: 'vsr-s1__summary', title: headline }, headline),
-          meta.model ? h('span', { className: 'vsr-s1__model', title: meta.model }, shortModel(meta.model)) : null),
+          h('span', { className: 'vsr-s1__reflex', 'data-system-one-part': 'reflex' }, REFLEX.tool),
+          h('span', { className: 'vsr-s1__summary', 'data-system-one-part': 'summary', title: headline }, headline),
+          h(Model, { model: meta.model })),
         h(ToolBody, { meta, fresh, cwd, openFile }))
       }
 
@@ -599,7 +656,13 @@ window.__ModuleLoader__.load({
 .vsr-s1__summary--bad{color:var(--vsr-s1-bad)}
 .vsr-s1__verdict{font-weight:600;color:var(--vsr-s1-text)}
 .vsr-s1__verdict--ok{color:var(--vsr-s1-ok)}.vsr-s1__verdict--warn{color:color-mix(in srgb,var(--vsr-s1-warn) 82%,var(--vsr-s1-text))}.vsr-s1__verdict--bad{color:var(--vsr-s1-bad)}.vsr-s1__verdict--info{color:var(--vsr-s1-ember-deep)}.vsr-s1__verdict--muted{color:var(--vsr-s1-text-3)}
-.vsr-s1__model{flex:none;color:var(--vsr-s1-text-3);font-size:12px;white-space:nowrap}
+.vsr-s1__model{flex:none;color:var(--vsr-s1-text-2);font-size:12px;font-weight:700;letter-spacing:-.005em;white-space:nowrap}
+.vsr-s1--notice{display:flex;align-items:center;gap:9px;min-width:0;margin:4px 0;padding:3px 0}
+.vsr-s1--notice .vsr-s1__summary{white-space:normal}
+.vsr-s1__duo{position:relative;display:inline-flex;flex:none;align-items:center;gap:5px;height:22px;padding:0 9px 0 8px;border-radius:999px;color:#fff;font-size:12px;font-weight:650;white-space:nowrap;background:linear-gradient(110deg,var(--vsr-s1-ember) 0%,#B04FD0 58%,#2F7BF6 100%);box-shadow:0 1px 2px rgba(90,60,170,.25),inset 0 1px 0 rgba(255,255,255,.32)}
+.vsr-s1__glyph{flex:none}
+.vsr-s1__links{display:inline-flex;flex:none;gap:10px}
+a.vsr-s1__link{text-decoration:none}
 .vsr-s1__rows{display:grid;grid-template-columns:auto minmax(0,1fr) auto;column-gap:12px;row-gap:8px;margin-top:9px}
 .vsr-s1__rows>*{grid-column:1/-1}
 .vsr-s1__row{display:grid;grid-template-columns:auto minmax(0,1fr) auto;grid-template-columns:subgrid;column-gap:12px;align-items:start}
@@ -631,14 +694,15 @@ window.__ModuleLoader__.load({
 .vsr-s1--plain .vsr-s1__reflex{color:var(--vsr-s1-text-2)}
 .vsr-s1__raw{margin:4px 0 8px;padding:8px 10px;max-height:320px;overflow:auto;border-radius:8px;background:color-mix(in srgb,var(--vsr-s1-text-3) 10%,transparent);font-family:var(--vsr-s1-mono);font-size:12px;white-space:pre-wrap}
 .vsr-s1__q{display:grid;grid-template-columns:minmax(80px,140px) minmax(0,1fr);column-gap:14px;align-items:start}
-.vsr-s1__qname{overflow:hidden;color:var(--vsr-s1-text);font-family:var(--vsr-s1-mono);font-size:12.5px;line-height:10px;white-space:nowrap;text-overflow:ellipsis;background:none;padding:0}
+.vsr-s1__qname{overflow:hidden;color:var(--vsr-s1-text);font-family:var(--vsr-s1-mono);font-size:12.5px;line-height:16px;white-space:nowrap;text-overflow:ellipsis;background:none;padding:0}
 .vsr-s1__qbody{display:grid;gap:4px;min-width:0}
-.vsr-s1__stack{display:flex;gap:2px;height:8px;border-radius:4px;overflow:hidden;background:var(--vsr-s1-track)}
+.vsr-s1__stack{display:flex;gap:2px;height:8px;margin-top:4px;border-radius:4px;overflow:hidden;background:var(--vsr-s1-track)}
 .vsr-s1__stack>i{display:block;min-width:3px;height:100%;transform-origin:left center}
 .vsr-s1__legend{display:flex;flex-wrap:wrap;gap:1px 14px;color:var(--vsr-s1-text-2);font-size:12.5px}
 .vsr-s1__key{display:inline-flex;align-items:center;white-space:nowrap}
 .vsr-s1__key b{margin-left:4px;color:var(--vsr-s1-text);font-weight:600;font-variant-numeric:tabular-nums}
 .vsr-s1__key--note{color:var(--vsr-s1-text-3)}
+.vsr-s1__key--bad{color:var(--vsr-s1-bad);font-weight:600}
 .vsr-s1__swatch{flex:none;width:8px;height:8px;margin-right:6px;border-radius:2px}
 .vsr-s1__foot{color:var(--vsr-s1-text-3);font-size:12.5px}
 .vsr-s1__foot code{font-family:var(--vsr-s1-mono)}