chore: adopt pre-existing working-tree state before trunk merge

Uncommitted machine/session edits (live config, models, docs drift) were
blocking the merge of origin/main. Committed as-is to preserve them; the
merge that follows resolves overlapping prose files toward upstream
canonical, with local variants recoverable from this commit. Pre-merge
copies also in .AGENTTRASH/pre-merge-2026-10-18/.

agent/config.yml

@@ -1,5 +1,6 @@
 providers:
-  openrouterVariant: floor
+  openrouterVariant: online
+  fetch: auto
 modelRoles:
   slow: llamacpp (dankclaw)/frank-dragoon:medium
   vision: llamacpp (dankclaw-3090)/frank-zealot:xhigh
@@ -18,9 +19,10 @@ modelRoles:
   memory: llamacpp (dankclaw-3090)/frank-zealot:medium
 symbolPreset: nerd
 composer:
-  shape: claude
+  shape: band
+  tokenRate: true
 theme:
-  dark: dark-terminal
+  dark: dark-gruvbox
   light: light
 setupVersion: 2
 browser:
@@ -57,8 +59,7 @@ retry:
       - openai-codex/gpt-5.5
       - xai-oauth/grok-4.5
       - web/ollama
-    speech:
-      []
+    speech: []
     llamacpp (dankserver)/frank-archon:
       - llamacpp (dankclaw)/frank-dragoon
   maxRetries: 10
@@ -67,7 +68,7 @@ searxng:
 exa:
   enabled: false
 memory:
-  backend: local
+  backend: sharpshooter
 autolearn:
   enabled: true
   autoContinue: true
@@ -75,12 +76,12 @@ compaction:
   remoteEndpoint: http://192.168.0.143:7771/v1/chat/completions
   methodOrder:
     - shake
+    - snapcompact
     - soft
     - handoff
-    - snapcompact
     - remote
   idleThresholdTokens: 100000
-  thresholdPercent: 85
+  thresholdPercent: 95
   idleEnabled: true
   thresholdTokens: -1
   dropUseless: false
@@ -90,43 +91,75 @@ compaction:
   enabled: true
   experimentalContextManagement: false
 interruptMode: immediate
-defaultThinkingLevel: medium
+defaultThinkingLevel: xhigh
 hideThinkingBlock: false
-proseOnlyThinking: true
+proseOnlyThinking: false
 terminal:
   showProgress: true
-disabledExtensions:
-  []
+disabledExtensions: []
 statusLine:
   separator: powerline
-  preset: nerd
+  preset: custom
   contextLine: embedded
   transparent: true
   compactThinkingLevel: true
   showHookStatus: true
+  sessionAccent: true
+  leftSegments:
+    - session_name
+    - vim
+    - mode
+    - hostname
+    - path
+    - git
+    - pr
+  rightSegments:
+    - model
+    - cost
+    - context_pct
+    - time_spent
+  segmentOptions:
+    model:
+      showThinkingLevel: true
+    path:
+      abbreviate: true
+      stripWorkPrefix: true
+      maxLength: 120
+    git:
+      showBranch: false
+      showStaged: true
+      showUnstaged: true
+      showUntracked: true
 tui:
   textSizing: true
   codexResetFireworks: false
   hyperlinks: auto
   tight: true
+  resizeScrollback: rebuild
+  titleSpinner: pulse
 display:
   shimmer: kitt
   smoothStreaming: true
   showTokenUsage: true
+  pinnedAgents: collapsed
+  subagentLivePreview: true
 task:
   showResolvedModelBadge: true
-  maxConcurrency: 2
+  maxConcurrency: 3
   agentModelOverrides:
     designer: llamacpp (dankclaw-3090)/frank-zealot
     librarian: llamacpp (dankclaw-3090)/frank-zealot
-    reviewer: llamacpp (dankclaw-3090)/frank-zealot
-    scout: llamacpp (dankclaw-3090)/frank-zealot
-    security-reviewer: llamacpp (dankclaw-3090)/frank-zealot
+    reviewer: llamacpp (dankserver)/frank-archon
+    scout: llamacpp (dankserver)/frank-archon
+    security-reviewer: llamacpp (dankclaw)/frank-dragoon
     sonic: llamacpp (dankclaw-3090)/frank-zealot
-    task: llamacpp (dankclaw-3090)/frank-zealot
+    task: llamacpp (dankserver)/frank-archon
+  eager: default
+  enableLsp: true
 snapcompact:
   systemPrompt: none
   toolResults: false
+  shape: auto
 extendedContext: false
 ttsr:
   contextMode: discard
@@ -136,12 +169,12 @@ checkpoint:
   enabled: true
 readLineNumbers: true
 startup:
-  showSplash: false
+  showSplash: true
   changelogMode: summary
 update:
   channel: stable
 features:
-  unexpectedStopDetection: smart
+  unexpectedStopDetection: mechanical
 stt:
   submitTrigger: say-submit
   enabled: true
@@ -160,6 +193,7 @@ images:
       - litterbox
 edit:
   mode: hashline
+  fuzzyThreshold: 0.9
 dev:
   autoqaConsent: granted
 astGrep:
@@ -169,7 +203,7 @@ vault:
 tts:
   localVoice: bm_george
 speech:
-  enabled: false
+  enabled: true
   mode: yield
   enhanced: true
   voice: am_fenrir
@@ -178,6 +212,9 @@ secrets:
 read:
   renderMarkdown: true
   toolResultPreview: true
+  defaultLimit: 1000
+  summarize:
+    prose: false
 lsp:
   formatOnWrite: true
   diagnosticsOnEdit: true
@@ -187,4 +224,42 @@ speechgen:
 live:
   voice: vale
 contextPromotion:
-  enabled: true
+  enabled: true
+title:
+  icons: emoji
+  generator: tiny
+followUpMode: one-at-a-time
+tools:
+  approvalMode: yolo
+  format: auto
+marketplace:
+  autoUpdate: notify
+bash:
+  allowCompoundCommands: true
+  gitGuard: true
+bashInterceptor:
+  enabled: false
+shellMinimizer:
+  sourceOutlineLevel: default
+generate_image:
+  enabled: false
+computer:
+  enabled: true
+  display: active
+ratchet:
+  enabled: true
+github:
+  enabled: true
+security:
+  enabled: true
+todo:
+  reminders: true
+mcp:
+  notifications: false
+plan:
+  defaultOnStartup: false
+isolation:
+  backend: auto
+worktree:
+  onStart: create
+  onExit: keep