dsh-tacit 0.3.0 → 0.4.0

package/README.md

@@ -50,14 +50,14 @@ already configured in the harness (Tacit never reads it).
 | | What | Cost |
 | --- | --- | --- |
 | **Zero-click learning** | messy turns and your own corrections are analyzed in the background, with the previous turn as context; automatic analyses are capped per day (30 by default) | $0.001–0.003 each |
-| **Directives that earn their place** | learned directives are injected as a short system-prompt section you can read, edit, toggle or delete; a new one starts as a *candidate* and is retired if your messy-turn rate gets worse | free |
+| **Directives that earn their place** | learned directives are injected as a short system-prompt section you can read, edit, toggle or delete; a new one goes on trial (one per scope at a time) and is retired if you start correcting the agent more often | free |
 | **✨ Improve** | a composer button that rewrites your current draft using what Tacit has learned, with a before/after preview and 👍/👎 | $0.001–0.002 per click |
-| **Measured, not guessed** | Settings shows your real trend — messy-turn rate and tokens per turn, first 20 turns vs. latest 20 — and Tacit's own spend: every call metered and priced at list price, shown in Settings | free |
+| **Measured, not guessed** | Settings shows your real trend — how often you correct the agent, messy-turn rate and tokens per turn, first 20 turns vs. latest 20 — and Tacit's own spend: every call metered and priced at list price, shown in Settings | free |
 
 <p align="center">
-  <img alt="Tacit settings with automatic learning controls and an editable active directive" src="https://raw.githubusercontent.com/hackernotfound/dsh-tacit/main/docs/assets/tacit-settings.png" width="960">
+  <img alt="Settings → Tacit: the Overview card with automatic learning status and the Usage card with spend tiles, a daily spend chart, spend by operation and the run list" src="https://raw.githubusercontent.com/hackernotfound/dsh-tacit/main/docs/assets/tacit-settings.png" width="960">
 </p>
-<p align="center"><sub>Settings → Tacit, captured from a clean local profile with a synthetic example directive. (Predates the eight-card layout and the usage/cost dashboard — pending a recapture.)</sub></p>
+<p align="center"><sub>Settings → Tacit with Overview and Usage expanded, captured from a clean local profile seeded with synthetic runs and directives.</sub></p>
 
 ## How it works
 

package/client/client.js

@@ -50,6 +50,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'status.autoOn': '自动学习已开启 · 今日 {today}/{budget}',
       'status.autoOff': '自动学习已关闭 — 仅在你点击「分析」时学习。',
       'status.autoHint': '混乱的轮次（重试、工具错误、压缩）以及你纠正智能体的下一条消息会被自动分析，无需点击。',
+      'status.trendCorrections': '你纠正智能体：{a} → {b}',
       'status.trendMessy': '混乱轮次：{a} → {b}',
       'status.trendTokens': '每轮 tokens：{a} → {b}',
       'status.trendHint': '（最早 {n} 轮 vs 最近 {n} 轮，真实数据）',
@@ -80,6 +81,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'steer.remove': '删除',
       'steer.preview': '实际注入的文本',
       'steer.distilled': '自动提炼',
+      'steer.queued': '等待试用',
       'steer.trial': '试用 {n}/{total}',
       'steer.active': '已生效',
       'steer.retired': '已淘汰 · {reason}',
@@ -185,6 +187,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'usage.col.time': '时间',
       'usage.col.op': '操作',
       'usage.col.scope': '范围',
+      'usage.scopeAll': '全部会话',
       'usage.col.model': '模型',
       'usage.col.status': '状态',
       'usage.col.calls': '计费调用',
@@ -236,6 +239,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'privacy.warnHint': '填 0 表示关闭提醒。达到阈值的 80% 时开始提醒，超过阈值后标记为已超出。',
       'privacy.clearUsage': '清除用量记录',
       'privacy.apply': '应用',
+      'privacy.applyTo': '{action}：{field}',
       'confirm.reportsTitle': '清除所有分析报告？',
       'confirm.reportsBody': '这会删除 Tacit 为所有会话写下的全部分析报告。指令、风格规则和用量记录会保留。此操作无法撤销。',
       'confirm.usageTitle': '清除用量记录？',
@@ -280,6 +284,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'err.busy': '该轮次的分析已在运行中。',
       'err.no-llm': '无法访问模型服务。',
       'err.no-api-key': 'DeepSeek API Key 缺失或无效（请在 设置 → 模型 中配置）。',
+      'err.no-credit': '模型服务商余额或配额已耗尽。',
       'err.rate-limited': '请求被限流，请稍后重试。',
       'err.timeout': '模型调用超时，请重试。',
       'err.empty-response': '模型没有返回内容，请重试。',
@@ -295,6 +300,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'status.autoOn': 'Auto-learning on · {today}/{budget} today',
       'status.autoOff': 'Auto-learning off — Tacit only learns when you click Analyze.',
       'status.autoHint': 'Messy turns (retries, tool errors, compactions) and turns you correct in your next message are analyzed automatically — no clicks.',
+      'status.trendCorrections': 'You corrected the agent: {a} → {b}',
       'status.trendMessy': 'Messy turns: {a} → {b}',
       'status.trendTokens': 'Tokens/turn: {a} → {b}',
       'status.trendHint': '(first {n} turns vs. latest {n}, measured)',
@@ -325,6 +331,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'steer.remove': 'Remove',
       'steer.preview': 'Exact text injected',
       'steer.distilled': 'distilled',
+      'steer.queued': 'waiting for trial',
       'steer.trial': 'trial {n}/{total}',
       'steer.active': 'active',
       'steer.retired': 'retired · {reason}',
@@ -430,6 +437,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'usage.col.time': 'Time',
       'usage.col.op': 'Operation',
       'usage.col.scope': 'Scope',
+      'usage.scopeAll': 'all sessions',
       'usage.col.model': 'Model',
       'usage.col.status': 'Status',
       'usage.col.calls': 'Billed calls',
@@ -481,6 +489,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'privacy.warnHint': '0 turns the warning off. Tacit warns at 80 % of the amount and marks it exceeded above it.',
       'privacy.clearUsage': 'Clear usage history',
       'privacy.apply': 'Apply',
+      'privacy.applyTo': '{action}: {field}',
       'confirm.reportsTitle': 'Clear all analysis reports?',
       'confirm.reportsBody': 'This deletes every analysis report Tacit has written, for every session. Your directives, style rules and usage history are kept. This cannot be undone.',
       'confirm.usageTitle': 'Clear usage history?',
@@ -525,6 +534,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       'err.busy': 'An analysis for this turn is already running.',
       'err.no-llm': 'The model service is unavailable.',
       'err.no-api-key': 'The DeepSeek API key is missing or invalid (configure it in Settings → Models).',
+      'err.no-credit': 'Your provider balance or quota is exhausted.',
       'err.rate-limited': 'The request was rate-limited; try again shortly.',
       'err.timeout': 'The model call timed out; please retry.',
       'err.empty-response': 'The model returned no content; please retry.',
@@ -655,7 +665,6 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       usageFilters: { range: '30d', type: '', status: '', model: '', workspace: '', sessionId: '', page: 1, pageSize: 20 },
       usageRuns: {}, // runId → the full run (attempts included), fetched on first expand
       usageExpanded: new Set(), // runIds whose attempt rows are open
-      usageLoading: false,
       usageSeries: '30', // '7' | '30' — which sparkline the strip shows
       pricingRefreshing: false, // a /pricing-refresh call is in flight
       initStarted: false,
@@ -775,14 +784,12 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
 
     /** Read the whole cost panel in one call; a failure keeps the last envelope. */
     async function fetchUsage() {
-      rootStore.usageLoading = true
       try {
         const result = await api('/usage', usageQuery())
         if (result !== null && typeof result === 'object' && result.ok === true) rootStore.usage = result
       } catch {
         // A stale panel beats a blank one; the next poll tries again.
       }
-      rootStore.usageLoading = false
       notifyRoot()
     }
 
@@ -1752,6 +1759,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
         h('div', { className: 'tacit-progress-text' }, autoOn ? t('status.autoHint') : t('status.autoOff')),
         hasTrend
           ? h('div', { className: 'tacit-trend' },
+            h('span', { className: 'tacit-chip' }, t('status.trendCorrections', { a: pct(trend.early.correctionRate), b: pct(trend.recent.correctionRate) })),
             h('span', { className: 'tacit-chip' }, t('status.trendMessy', { a: pct(trend.early.messyRate), b: pct(trend.recent.messyRate) })),
             h('span', { className: 'tacit-chip' }, t('status.trendTokens', { a: fmt(trend.early.tokensPerTurn), b: fmt(trend.recent.tokensPerTurn) })),
             h('span', { className: 'tacit-progress-text' }, t('status.trendHint', { n: String(trend.window) })))
@@ -2253,6 +2261,13 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
      */
     let confirmOpener = null
 
+    /**
+     * The two focus stops of the dialog, addressed by id rather than by ref:
+     * refs would add hooks to a component whose hook count must not move.
+     */
+    const CONFIRM_CANCEL_ID = 'tacit-confirm-cancel'
+    const CONFIRM_ACCEPT_ID = 'tacit-confirm-accept'
+
     function captureConfirmOpener() {
       confirmOpener = typeof document !== 'undefined' && document !== null ? document.activeElement : null
     }
@@ -2281,10 +2296,25 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       return h('div', {
         className: 'tacit-modal-backdrop',
         onClick: cancel,
-        // Escape cancels from anywhere inside: keydown from either button
-        // bubbles here.
+        // Escape and Tab are both handled here: a keydown from either button
+        // bubbles to the backdrop. With exactly two stops in the dialog,
+        // forward and backward tabbing both land on the other button, so
+        // `shiftKey` needs no branch of its own.
         onKeyDown: (event) => {
-          if (event.key === 'Escape') cancel()
+          if (event.key === 'Escape') {
+            // Stopped here: the host's Settings modal also closes on Escape, and
+            // cancelling a confirm must not take the whole settings page with it.
+            if (typeof event.stopPropagation === 'function') event.stopPropagation()
+            cancel()
+            return
+          }
+          if (event.key !== 'Tab' || typeof document === 'undefined' || document === null) return
+          const cancelButton = document.getElementById(CONFIRM_CANCEL_ID)
+          const acceptButton = document.getElementById(CONFIRM_ACCEPT_ID)
+          if (cancelButton === null || acceptButton === null) return
+          const next = document.activeElement === acceptButton ? cancelButton : acceptButton
+          event.preventDefault()
+          if (typeof next.focus === 'function') next.focus()
         },
       },
       h('div', {
@@ -2298,8 +2328,8 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       h('h3', { className: 'tacit-modal-title', id: 'tacit-confirm-title' }, title),
       h('p', { className: 'tacit-confirm-body' }, body),
       h('div', { className: 'tacit-confirm-actions' },
-        h('button', { type: 'button', className: 'tacit-btn', autoFocus: true, onClick: cancel }, t('confirm.cancel')),
-        h('button', { type: 'button', className: 'tacit-btn tacit-btn-danger', onClick: onConfirm }, confirmLabel))))
+        h('button', { type: 'button', id: CONFIRM_CANCEL_ID, className: 'tacit-btn', autoFocus: true, onClick: cancel }, t('confirm.cancel')),
+        h('button', { type: 'button', id: CONFIRM_ACCEPT_ID, className: 'tacit-btn tacit-btn-danger', onClick: onConfirm }, confirmLabel))))
     }
 
     // ── Global panel (Settings → Tacit section) ────────────────────────────
@@ -2362,14 +2392,16 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
                 typeof entry.workspace === 'string' && entry.workspace.length > 0
                   ? h('span', { className: 'tacit-chip tacit-chip-scope', title: entry.workspace }, t('steer.workspace', { name: labelOf(entry.workspace) }))
                   : null,
-                entry.status === 'candidate'
-                  ? h('span', { className: 'tacit-chip tacit-chip-trial' }, t('steer.trial', {
-                    n: String(entry.trial !== null && typeof entry.trial === 'object' && typeof entry.trial.turns === 'number' ? entry.trial.turns : 0),
-                    total: String(config !== null && typeof config.directiveTrialTurns === 'number' ? config.directiveTrialTurns : 10),
-                  }))
-                  : entry.status === 'retired'
-                    ? h('span', { className: 'tacit-chip tacit-chip-warn' }, t('steer.retired', { reason: String(entry.retiredReason || '') }))
-                    : h('span', { className: 'tacit-chip tacit-chip-ok' }, t('steer.active')),
+                entry.status === 'queued'
+                  ? h('span', { className: 'tacit-chip tacit-chip-muted' }, t('steer.queued'))
+                  : entry.status === 'candidate'
+                    ? h('span', { className: 'tacit-chip tacit-chip-trial' }, t('steer.trial', {
+                      n: String(entry.trial !== null && typeof entry.trial === 'object' && typeof entry.trial.turns === 'number' ? entry.trial.turns : 0),
+                      total: String(config !== null && typeof config.directiveTrialTurns === 'number' ? config.directiveTrialTurns : 10),
+                    }))
+                    : entry.status === 'retired'
+                      ? h('span', { className: 'tacit-chip tacit-chip-warn' }, t('steer.retired', { reason: String(entry.retiredReason || '') }))
+                      : h('span', { className: 'tacit-chip tacit-chip-ok' }, t('steer.active')),
                 h('button', { type: 'button', className: 'tacit-btn tacit-btn-sm', onClick: () => editDirectives({ action: 'remove', id: entry.id }) }, t('steer.remove'))))),
           h('div', { className: 'tacit-settings-row' },
             h('input', {
@@ -2515,9 +2547,15 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
         const confirm = rootStore.confirm !== null && typeof rootStore.confirm === 'object' && rootStore.confirm.kind === 'usage'
           ? 'usage'
           : (rootStore.confirm !== null && typeof rootStore.confirm === 'object' && rootStore.confirm.kind === 'reports' ? 'reports' : null)
-        const retention = config !== null && typeof config.costHistoryDays === 'number' && RETENTION_DAYS.includes(config.costHistoryDays)
+        const retention = config !== null && typeof config.costHistoryDays === 'number' && Number.isFinite(config.costHistoryDays) && config.costHistoryDays > 0
           ? config.costHistoryDays
           : 30
+        // A value set by hand in the YAML need not be one of the offered days.
+        // It gets an option of its own, in place, rather than being displayed
+        // as a neighbour it is not.
+        const retentionDays = RETENTION_DAYS.includes(retention)
+          ? RETENTION_DAYS
+          : [...RETENTION_DAYS, retention].sort((a, b) => a - b)
         /** Every card is titled by `card.<id>` and driven by `rootStore.sections`. */
         const card = (id, children, extra) => SectionCard(kit, {
           id,
@@ -2584,7 +2622,6 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
           card('pricing', [
             PricingCard(kit, {
               pricing: usagePricing,
-              open: sections.pricing === true,
               refreshing: rootStore.pricingRefreshing === true,
               onRefresh: () => refreshPricing(t),
             }),
@@ -2661,7 +2698,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
                 value: String(retention),
                 onChange: (event) => updateRootConfig({ costHistoryDays: Number(event.target.value) }),
               },
-              ...RETENTION_DAYS.map((days) => h('option', { key: days, value: String(days) }, String(days))))),
+              ...retentionDays.map((days) => h('option', { key: days, value: String(days) }, String(days))))),
             h('div', { className: 'tacit-settings-row' },
               h('label', { className: 'tacit-settings-label', htmlFor: 'tacit-warn-daily' }, t('privacy.warnDaily')),
               h('input', {
@@ -2678,7 +2715,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
                 className: 'tacit-btn tacit-btn-sm',
                 // Two identically labelled buttons in one card: the accessible
                 // name has to say which threshold each one applies.
-                'aria-label': t('privacy.apply') + ': ' + t('privacy.warnDaily'),
+                'aria-label': t('privacy.applyTo', { action: t('privacy.apply'), field: t('privacy.warnDaily') }),
                 onClick: () => applyWarn('costWarnDailyUsd', dailyText, setDailyText),
               }, t('privacy.apply'))),
             h('div', { className: 'tacit-settings-row' },
@@ -2697,7 +2734,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
                 className: 'tacit-btn tacit-btn-sm',
                 // Two identically labelled buttons in one card: the accessible
                 // name has to say which threshold each one applies.
-                'aria-label': t('privacy.apply') + ': ' + t('privacy.warnMonthly'),
+                'aria-label': t('privacy.applyTo', { action: t('privacy.apply'), field: t('privacy.warnMonthly') }),
                 onClick: () => applyWarn('costWarnMonthlyUsd', monthlyText, setMonthlyText),
               }, t('privacy.apply'))),
             h('p', { className: 'tacit-panel-hint' }, t('privacy.warnHint')),
@@ -2744,7 +2781,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
     /** Every run type and op the ledger can tag, in the order the filters list them. */
     const USAGE_RUN_TYPES = ['bootstrap', 'analysis', 'analysis-batch', 'improve', 'directive-distillation', 'style-distillation', 'prompt-enrichment']
     const USAGE_RANGES = ['today', '7d', '30d', 'month', 'all']
-    const USAGE_STATUSES = ['success', 'partial', 'failed']
+    const USAGE_STATUSES = ['running', 'success', 'partial', 'failed']
     const USAGE_COLUMNS = ['time', 'op', 'scope', 'model', 'status', 'calls', 'tokens', 'cost']
 
     /** One label/value tile; `note` is the small "n unpriced" line under the value. */
@@ -2942,7 +2979,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
         ? run.attempts.filter((attempt) => attempt !== null && typeof attempt === 'object')
         : null
       return h('div', { className: 'tacit-usage-attempts', id: 'tacit-run-' + runId, role: 'row' },
-        h('div', { className: 'tacit-usage-cell tacit-usage-attempts-cell', role: 'cell' },
+        h('div', { className: 'tacit-usage-cell tacit-usage-attempts-cell', role: 'cell', 'aria-colspan': USAGE_COLUMNS.length },
           attempts === null
             ? h('p', { className: 'tacit-panel-hint' }, t('usage.loading'))
             : attempts.map((attempt) => AttemptRow(kit, attempt))))
@@ -2951,9 +2988,13 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
     /** One run row; the first cell is the disclosure button for its attempts. */
     function RunRow(kit, { item, open, onToggleRun }) {
       const { t, fmtTime } = kit
+      // A bootstrap run carries no workspace because it covers every session,
+      // which is worth saying; any other run type missing the field is simply
+      // a row with nothing to scope by.
+      const unscoped = item.type === 'bootstrap' ? t('usage.scopeAll') : '—'
       const scope = item.workspace.length > 0 && item.turn !== null
         ? item.workspace + ' · #' + String(item.turn)
-        : (item.workspace.length > 0 ? item.workspace : (item.turn !== null ? '#' + String(item.turn) : '—'))
+        : (item.workspace.length > 0 ? item.workspace : (item.turn !== null ? '#' + String(item.turn) : unscoped))
       const cell = (key, child) => h('span', { key, className: 'tacit-usage-cell', role: 'cell' }, child)
       return h('div', { className: 'tacit-usage-row', role: 'row' },
         cell('time', h('button', {
@@ -3149,13 +3190,13 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
 
     /**
      * The Pricing card body. Like `UsageCard` a plain renderer, not a
-     * component: it owns no hooks and no state. It builds nothing at all while
-     * collapsed — the header summary already carries the headline rate, and
-     * this page re-renders on every 10s usage poll.
+     * component: it owns no hooks and no state. It renders whether or not its
+     * card is open, because the `SectionCard` around it hides a collapsed body
+     * rather than unmounting it, which is what keeps find-in-page working over
+     * the rate table.
      */
-    function PricingCard(kit, { pricing, open, onRefresh, refreshing }) {
+    function PricingCard(kit, { pricing, onRefresh, refreshing }) {
       const { t, fmtTime } = kit
-      if (open !== true) return null
       const priced = pricingOf(pricing)
       const models = Object.keys(priced.models).sort()
       const when = priced.refreshedAt > 0
@@ -3224,6 +3265,10 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
       + '.tacit-settings{background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);border-radius:10px;padding:10px 12px;margin-bottom:12px;display:flex;flex-direction:column;gap:8px}'
       + '.tacit-settings-title{font-size:12px;font-weight:600}.tacit-settings-row{display:flex;align-items:center;gap:8px;flex-wrap:wrap}.tacit-settings-label{font-size:12px;color:var(--dsw-alias-label-secondary);min-width:150px}'
       + '.tacit-settings-notice{font-size:11px;color:var(--dsw-alias-state-success-primary)}'
+      // The idle live region has to stay mounted to announce, but as an empty
+      // flex item it still claims one of the panel's 10px gaps; -5px a side
+      // gives that back.
+      + '.tacit-panel>.tacit-settings-notice:empty{margin-block:-5px}'
       + '.tacit-select,.tacit-input{font:inherit;font-size:12px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l1);border-radius:6px;padding:3px 8px}.tacit-input{width:90px}'
       + '.tacit-improve-btn{font:inherit;font-size:13px;font-weight:500;line-height:20px;color:var(--dsw-alias-label-secondary);background:transparent;border:0;border-radius:24px;cursor:pointer;height:28px;padding:0 8px;white-space:nowrap;display:inline-flex;align-items:center;gap:4px}.tacit-improve-btn:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}'
       + '.tacit-check{width:14px;height:14px;accent-color:var(--dsw-alias-brand-primary);flex:none;margin:2px 4px 0 0}'
@@ -3398,6 +3443,7 @@ if (typeof window === 'undefined' || window.__ModuleLoader__ === undefined || ty
         clearUsageHistory,
         runNotice,
         fmtRate,
+        ConfirmDialog,
         UsageCard,
         PricingCard,
       },

package/lib/analyze.js

@@ -114,6 +114,7 @@ export const DIRECTIVE_TOOL = {
         items: {
           type: 'object',
           properties: {
+            id: { type: 'string', description: 'the [id] of the current directive this one keeps or rewords; omit for a genuinely new directive' },
             text: { type: 'string', maxLength: 220, description: 'one sentence, at most 25 words' },
             workspace: { type: 'string', description: 'only when the habit shows up in exactly one workspace: that workspace name as written in the evidence' },
           },
@@ -125,6 +126,67 @@ export const DIRECTIVE_TOOL = {
   },
 }
 export const MAX_WORKSPACE_DIRECTIVES = 4
+/** Retired directives kept on the profile so the distiller is told not to re-propose them. */
+export const MAX_RETIRED = 6
+
+/** The workspace a directive is limited to; '' = every conversation. */
+export const scopeOf = (entry) => (typeof entry.workspace === 'string' && entry.workspace.length > 0 ? entry.workspace : '')
+const directiveKey = (scope, text) => scope + '\n' + text.trim().toLowerCase()
+
+/** At most MAX_DIRECTIVES global and MAX_WORKSPACE_DIRECTIVES per-workspace live directives, plus the last MAX_RETIRED retired ones; order kept. */
+export function capDirectives(list) {
+  const retired = list.filter((entry) => entry.status === 'retired')
+  const forgotten = new Set(retired.slice(0, Math.max(0, retired.length - MAX_RETIRED)))
+  const counts = new Map()
+  return list.filter((entry) => {
+    if (entry.status === 'retired') return !forgotten.has(entry)
+    const scope = scopeOf(entry)
+    const n = counts.get(scope) ?? 0
+    if (n >= (scope === '' ? MAX_DIRECTIVES : MAX_WORKSPACE_DIRECTIVES)) return false
+    counts.set(scope, n + 1)
+    return true
+  })
+}
+
+/**
+ * Merge the model's new complete set of directives ({ id?, text, workspace? })
+ * into the profile: user entries are untouched; the global distilled set and
+ * the distilled set of every workspace the model mentioned are replaced;
+ * distilled entries of other workspaces are kept (their evidence was not in
+ * this batch), and so are retired ones (the do-not-re-propose list). An item
+ * naming an existing id, or repeating an existing text, keeps that entry's
+ * identity, state, trial and enabled flag and only updates the text; a
+ * retired entry stays exactly as it is; a new one queues for its trial slot.
+ */
+export function mergeDirectives(profile, items, { nextId }) {
+  const users = profile.directives.filter((entry) => entry.source === 'user')
+  const userKeys = new Set(users.map((entry) => directiveKey(scopeOf(entry), entry.text)))
+  const prior = profile.directives.filter((entry) => entry.source !== 'user')
+  const byId = new Map(prior.map((entry) => [entry.id, entry]))
+  const byKey = new Map(prior.map((entry) => [directiveKey(scopeOf(entry), entry.text), entry]))
+  const mentioned = new Set([''])
+  for (const item of items) mentioned.add(scopeOf(item))
+  const distilled = []
+  const seen = new Set()
+  const matched = new Set()
+  for (const item of items) {
+    const scope = scopeOf(item)
+    const key = directiveKey(scope, item.text)
+    if (seen.has(key) || userKeys.has(key)) continue
+    seen.add(key)
+    const kept = (typeof item.id === 'string' ? byId.get(item.id) : undefined) ?? byKey.get(key)
+    if (kept !== undefined) {
+      if (kept.status === 'retired' || matched.has(kept.id)) continue
+      matched.add(kept.id)
+      distilled.push({ ...kept, text: item.text })
+      continue
+    }
+    distilled.push({ id: nextId(), text: item.text, enabled: true, source: 'distilled', createdAt: Date.now(), status: 'queued', ...(scope === '' ? {} : { workspace: scope }) })
+  }
+  const untouched = prior.filter((entry) => !matched.has(entry.id) && (entry.status === 'retired' || !mentioned.has(scopeOf(entry))))
+  profile.directives = capDirectives([...users, ...distilled, ...untouched])
+  return profile
+}
 
 /** The last path segment of a workspace directory — what a person calls the project. */
 export function workspaceLabel(cwd) {
@@ -201,23 +263,36 @@ export function normalizeEnrichNote(text) {
 
 // ── Measured trend ─────────────────────────────────────────────────────────
 
+/**
+ * One conversation's turns, each with `corrected`: whether the user's NEXT
+ * message in that conversation reads as a correction of it. The last turn has
+ * no next message and counts as not corrected.
+ */
+export function markCorrections(turns) {
+  const list = (Array.isArray(turns) ? turns : []).filter((turn) => turn !== null && typeof turn === 'object')
+  return list.map((turn, index) => ({ ...turn, corrected: index + 1 < list.length && looksLikeCorrection(list[index + 1].prompt) }))
+}
+
 function windowStats(turns) {
   const n = turns.length
-  if (n === 0) return { n: 0, messyRate: 0, tokensPerTurn: 0 }
+  if (n === 0) return { n: 0, correctionRate: 0, messyRate: 0, tokensPerTurn: 0 }
+  let corrected = 0
   let messy = 0
   let tokens = 0
   for (const turn of turns) {
+    if (turn.corrected === true) corrected += 1
     if (isMessyTurn(turn, { minSteps: Number.POSITIVE_INFINITY })) messy += 1
     const usage = turn.usage !== null && typeof turn.usage === 'object' ? turn.usage : {}
     const read = (key) => (typeof usage[key] === 'number' && Number.isFinite(usage[key]) ? usage[key] : 0)
     tokens += read('inputTokens') + read('outputTokens') + read('cacheReadTokens') + read('reasoningTokens')
   }
-  return { n, messyRate: messy / n, tokensPerTurn: Math.round(tokens / n) }
+  return { n, correctionRate: corrected / n, messyRate: messy / n, tokensPerTurn: Math.round(tokens / n) }
 }
 
 /**
  * Real before/after numbers from the fold: the first `window` finished turns
- * vs. the latest `window`, on rework signals (retries/errors/compactions/
+ * vs. the latest `window`, on how often the user corrected the agent (turns
+ * pre-marked by `markCorrections`), rework signals (retries/errors/compactions/
  * rejections — step counts are deliberately NOT a signal) and tokens/turn.
  */
 export function computeTrend(turns, { window = 20 } = {}) {
@@ -477,7 +552,9 @@ export const DIRECTIVE_SYSTEM_PROMPT = [
   'mood, addressed to the agent. A directive that needs a second sentence is two',
   'directives or too specific. You are writing',
   'the COMPLETE new set: keep existing directives that still hold (reworded if',
-  'sharper), drop ones that were one-off, add what is missing. No preamble.',
+  'sharper, returned with their id), drop ones that were one-off, add what is',
+  'missing. Never re-propose a retired directive or a close rephrasing of one.',
+  'No preamble.',
 ].join('\n')
 
 export function buildDirectiveUserText(profile, recentReports = [], { labelOf = workspaceLabel } = {}) {
@@ -523,10 +600,19 @@ export function buildDirectiveUserText(profile, recentReports = [], { labelOf =
     lines.push('', '=== STYLE RULES THE USER CONFIRMED ===')
     for (const rule of rules) lines.push('- ' + clipSafe(rule.rule, 300))
   }
-  const existing = Array.isArray(profile?.directives) ? profile.directives.filter((entry) => typeof entry?.text === 'string' && entry.text.length > 0) : []
+  const directives = Array.isArray(profile?.directives) ? profile.directives.filter((entry) => typeof entry?.text === 'string' && entry.text.length > 0) : []
+  const directiveLine = (entry, withId) => '- ' + (withId && typeof entry.id === 'string' ? '[' + entry.id + '] ' : '') + clipDirective(entry.text)
+    + (typeof entry.workspace === 'string' && entry.workspace.length > 0 ? ' [workspace: ' + labelOf(entry.workspace) + ']' : '')
+  const existing = directives.filter((entry) => entry.status !== 'retired')
   if (existing.length > 0) {
     lines.push('', '=== CURRENT DIRECTIVES (keep the ones that still hold) ===')
-    for (const entry of existing) lines.push('- ' + clipDirective(entry.text) + (typeof entry.workspace === 'string' && entry.workspace.length > 0 ? ' [workspace: ' + labelOf(entry.workspace) + ']' : ''))
+    for (const entry of existing) lines.push(directiveLine(entry, true))
+    lines.push('When you keep or reword one of these, return it with its [id]; leave id out only for a genuinely new directive.')
+  }
+  const retired = directives.filter((entry) => entry.status === 'retired').slice(-MAX_RETIRED)
+  if (retired.length > 0) {
+    lines.push('', '=== RETIRED (made things worse while active; do not re-propose these) ===')
+    for (const entry of retired) lines.push(directiveLine(entry, false))
   }
   lines.push('', 'Write 2-4 directives for the agent about this user. A habit the user has', 'shown they can fix themselves is still worth a directive: the agent should', 'compensate for it when it is missing, not ask.')
   return lines.join('\n')
@@ -536,7 +622,8 @@ export function buildDirectiveUserText(profile, recentReports = [], { labelOf =
 const ASKS_USER_RE = /\b(ask|confirm with|check with|clarify with|verify with|get (approval|confirmation|permission) from) (the )?user\b|\bstop and ask\b|\bbefore doing anything\b|\bask (what|which|whether|if|for)\b/i
 
 /**
- * Parse a directives payload into clipped, deduped one-liners (≤4 kept);
+ * Parse a directives payload into clipped, deduped one-liners (≤4 kept), each
+ * with the id of the current directive it restates when the model gave one;
  * directives that instruct the agent to ask the user are rejected.
  */
 export function classifyDirectives(text) {
@@ -554,6 +641,7 @@ export function classifyDirectives(text) {
     const workspace = typeof item === 'object' && item !== null && typeof item.workspace === 'string' && item.workspace.trim().length > 0
       ? clipSafe(item.workspace.trim(), 200)
       : undefined
+    const id = typeof item === 'object' && item !== null && typeof item.id === 'string' && item.id.trim().length > 0 ? clipSafe(item.id.trim(), 64) : undefined
     const key = (workspace ?? '') + '\n' + value.toLowerCase()
     if (value.length === 0 || seen.has(key)) continue
     seen.add(key)
@@ -561,7 +649,7 @@ export function classifyDirectives(text) {
       rejected.push(value)
       continue
     }
-    kept.push(workspace === undefined ? { text: value } : { text: value, workspace })
+    kept.push({ text: value, ...(workspace === undefined ? {} : { workspace }), ...(id === undefined ? {} : { id }) })
     if (kept.length >= 4) break
   }
   return { kept, rejected }
@@ -574,14 +662,13 @@ export function classifyDirectives(text) {
  * nothing is enabled (an empty section contributes nothing).
  */
 export function buildSteeringSection(profile, { cwd } = {}) {
-  const here = typeof cwd === 'string' && cwd.length > 0 ? cwd : null
-  const scopeOf = (entry) => (typeof entry.workspace === 'string' && entry.workspace.length > 0 ? entry.workspace : null)
+  const here = typeof cwd === 'string' && cwd.length > 0 ? cwd : ''
   const candidates = (Array.isArray(profile?.directives) ? profile.directives : [])
-    .filter((entry) => entry !== null && typeof entry === 'object' && entry.enabled !== false && entry.status !== 'retired'
+    .filter((entry) => entry !== null && typeof entry === 'object' && entry.enabled !== false && entry.status !== 'retired' && entry.status !== 'queued'
       && typeof entry.text === 'string' && entry.text.trim().length > 0)
-    .filter((entry) => scopeOf(entry) === null || scopeOf(entry) === here)
+    .filter((entry) => scopeOf(entry) === '' || scopeOf(entry) === here)
   // This workspace's own directives first: they are the more specific ones.
-  const enabled = [...candidates.filter((entry) => scopeOf(entry) !== null), ...candidates.filter((entry) => scopeOf(entry) === null)]
+  const enabled = [...candidates.filter((entry) => scopeOf(entry) !== ''), ...candidates.filter((entry) => scopeOf(entry) === '')]
   if (enabled.length === 0) return { text: '', ids: [] }
   const header = [
     '## About this user (learned by Tacit from their past prompts)',

package/lib/index.js

@@ -87,7 +87,7 @@ export function apply(ctx, config) {
     const directives = store.profile().directives
     const count = (status) => directives.filter((entry) => entry.status === status).length
     console.info('[tacit] loaded — directives: ' + count('active') + ' active, ' + count('candidate') + ' candidates, '
-      + count('retired') + ' retired; steering ' + (cfg.steerAgent ? 'on' : 'off') + '; auto-analysis '
+      + count('queued') + ' queued, ' + count('retired') + ' retired; steering ' + (cfg.steerAgent ? 'on' : 'off') + '; auto-analysis '
       + (cfg.autoAnalyze ? 'on (cap ' + cfg.autoDailyBudget + '/day)' : 'off'))
   } catch {
     // Logging must never keep the plugin from loading.

package/lib/schema.js

@@ -29,7 +29,7 @@ export const COACH_PROVIDER = 'deepseek-official'
  * outside this list onto one of these. Every entry has an `err.*` key in both
  * dictionaries (`client/src/10-i18n.js`, test-enforced).
  */
-export const COACH_ERROR_CODES = ['no-llm', 'no-api-key', 'rate-limited', 'timeout', 'empty-response', 'call-failed']
+export const COACH_ERROR_CODES = ['no-llm', 'no-api-key', 'no-credit', 'rate-limited', 'timeout', 'empty-response', 'call-failed']
 
 /**
  * The loader-facing plugin config. Wrapped in `z.preprocess` so a patch row
@@ -232,15 +232,23 @@ const feedbackEntrySchema = z.object({
  * system prompt). `distilled` entries come from analyses; `user` entries are
  * typed in Settings and survive every distillation.
  */
-const directiveTrialSchema = z.object({
-  /** Finished turns observed while the candidate was injected. */
-  turns: z.number().int().min(0),
-  /** How many of those were messy. */
-  messy: z.number().int().min(0),
-  /** Messy-turn rate over the 20 turns before the trial started. */
-  baselineRate: z.number(),
-  startedAt: z.number(),
-})
+const directiveTrialSchema = z.preprocess(
+  // Profiles written before corrections were graded named the messy baseline `baselineRate`.
+  (raw) => (raw !== null && typeof raw === 'object' && 'baselineRate' in raw && !('baselineMessyRate' in raw) ? { ...raw, baselineMessyRate: raw.baselineRate } : raw),
+  z.object({
+    /** Finished turns observed while the candidate was injected. */
+    turns: z.number().int().min(0),
+    /** How many of those were messy. */
+    messy: z.number().int().min(0),
+    /** How many of those the user corrected with their next message. */
+    corrected: z.number().int().min(0).default(0),
+    /** Messy-turn rate over the 20 turns before the trial started. */
+    baselineMessyRate: z.number(),
+    /** Correction rate over those 20 turns; -1 = unknown (older profile), recomputed when the trial next advances. */
+    baselineCorrectionRate: z.number().default(-1),
+    startedAt: z.number(),
+  }),
+)
 
 const directiveSchema = z.object({
   id: z.string(),
@@ -248,8 +256,8 @@ const directiveSchema = z.object({
   enabled: z.boolean().default(true),
   source: z.enum(['distilled', 'user']).default('distilled'),
   createdAt: z.number(),
-  /** candidate = injected on trial; active = proven (or user-made); retired = made things worse. */
-  status: z.enum(['candidate', 'active', 'retired']).default('active'),
+  /** queued = waiting for its scope's trial slot; candidate = injected on trial; active = proven (or user-made); retired = made things worse. */
+  status: z.enum(['queued', 'candidate', 'active', 'retired']).default('active'),
   trial: directiveTrialSchema.optional(),
   retiredReason: z.string().optional(),
   /** Absolute workspace directory this directive is limited to; absent = every conversation. */
@@ -347,6 +355,12 @@ export const USAGE_OPS = [
   'enrichment',
 ]
 
+/** Every state one recorded attempt can end in. */
+export const USAGE_ATTEMPT_STATUSES = ['ok', 'failed', 'unmetered']
+
+/** Every state a run can be in. `running` is written too: the flush persists live runs. */
+export const USAGE_RUN_STATUSES = ['running', 'success', 'partial', 'failed']
+
 /** Every kind of run the tracker groups attempts into. */
 export const USAGE_RUN_TYPES = [
   'bootstrap',
@@ -382,7 +396,7 @@ export const usageAttemptSchema = z.object({
   provider: z.string().default(''),
   reasoningEffort: z.string().nullable().default(null),
   finish: z.string().default(''),
-  status: z.enum(['ok', 'failed', 'unmetered']),
+  status: z.enum(USAGE_ATTEMPT_STATUSES),
   code: z.string().default(''),
   sessionId: z.string().default(''),
   turn: z.number().nullable().default(null),
@@ -425,7 +439,7 @@ export const usageRunSchema = z.object({
   trigger: z.string().default(''),
   startedAt: z.number(),
   endedAt: z.number().default(0),
-  status: z.enum(['running', 'success', 'partial', 'failed']).default('running'),
+  status: z.enum(USAGE_RUN_STATUSES).default('running'),
   sessionId: z.string().default(''),
   turn: z.number().nullable().default(null),
   workspace: z.string().default(''),
@@ -466,7 +480,7 @@ export const usageSummarySchema = z.object({
 export const usageArgSchema = z.object({
   range: z.enum(['today', '7d', '30d', 'month', 'all']).optional(),
   type: z.enum(USAGE_RUN_TYPES).optional(),
-  status: z.enum(['success', 'partial', 'failed']).optional(),
+  status: z.enum(USAGE_RUN_STATUSES).optional(),
   model: z.string().max(64).optional(),
   workspace: z.string().max(200).optional(),
   sessionId: z.string().max(200).optional(),