theway-daemon 0.1.25

theway daemon — the single agent-runtime kernel (bin `thewayd`): harness assembly, local/sandbox tool policy, triggers/cron/session/DAG runtime, skills, MCP/LSP wiring, serving the gRPC/HTTP/MCP transports from theway-transport. Terminal UI lives in the theway-tui crate.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
impl TurnHost {
    async fn handle_web_command(&mut self, command: WireCommand, turn: &mut TurnState) {
        match command {
            WireCommand::Submit {
                session_id,
                text,
                images,
                interrupt,
            } => {
                if session_id.is_empty() || session_id == self.session.id {
                    self.submit_web_text(text, images, interrupt, turn).await;
                } else {
                    self.submit_web_text_for_session(&session_id, text, images, interrupt)
                        .await;
                }
            }
            WireCommand::TriggerRuleNow { id } => self.trigger_web_rule_now(id, turn).await,
            WireCommand::Abort { session_id } => {
                if session_id.is_empty() || session_id == self.session.id {
                    self.request_abort(turn);
                } else if !self.sessions.contains(&session_id) {
                    self.error_line(format!(
                        "abort ignored: session {session_id} is not an active or registered session {}",
                        self.session.id
                    ));
                } else {
                    self.cancel_session(&session_id);
                }
            }
            WireCommand::ResolveControlPlane {
                session_id,
                approve,
            } => {
                let session_id = if session_id.is_empty() {
                    self.session.id.clone()
                } else {
                    session_id
                };
                let decision = if approve {
                    theway_core::ControlPlanePromptDecision::Allow
                } else {
                    theway_core::ControlPlanePromptDecision::Deny {
                        reason: Some("denied by user".into()),
                    }
                };
                self.resolve_control_plane_prompt_for_session(&session_id, decision);
            }
            WireCommand::SetModel {
                session_id,
                spec,
                response,
            } => {
                let active_session = session_id.is_empty() || session_id == self.session.id;
                let ok = if active_session {
                    self.set_model_from_spec(&spec).await
                } else {
                    self.set_model_for_session(&session_id, &spec).await
                };
                if ok && active_session {
                    // A model-less session can now run the messages it has been
                    // holding in its queue.
                    self.start_next_queued_turn(turn);
                }
                let _ = response.send(ok);
            }
            WireCommand::SetThinking {
                session_id,
                level,
                response,
            } => {
                let ok = if session_id.is_empty() || session_id == self.session.id {
                    self.set_thinking_level(&level).await
                } else {
                    self.set_thinking_for_session(&session_id, &level).await
                };
                let _ = response.send(ok);
            }
            WireCommand::SetSkillDirs { dirs } => self.handle_set_skill_dirs(dirs, turn).await,
            WireCommand::Configure { config } => self.handle_configure(config, turn).await,
            WireCommand::InvokeExtensionCommand {
                name,
                arguments,
                has_interactive_client,
                response,
            } => {
                let result = self
                    .handle_extension_command(name, arguments, has_interactive_client)
                    .await;
                let _ = response.send(result);
            }
            WireCommand::ReloadExtensions {
                cancel_active,
                response,
            } => {
                let result = self
                    .handle_extension_reload(cancel_active, turn)
                    .await;
                let _ = response.send(result);
            }
            WireCommand::DecideExtensionTrust { request, response } => {
                let result = self.handle_extension_trust(request).await;
                let _ = response.send(result);
            }
            WireCommand::ActivateSession { request, response } => {
                let result = self.handle_activate_session(request, turn).await;
                let _ = response.send(result);
            }
            WireCommand::SetCredential { request, response } => {
                let result = self.handle_set_credential(request);
                let _ = response.send(result);
            }
            WireCommand::ClearCredential { request, response } => {
                let result = self.handle_clear_credential(request);
                let _ = response.send(result);
            }
            WireCommand::SessionDeleted { id } => {
                self.handle_session_deleted(&id, turn).await;
            }
        }
    }

    /// A transport `delete_session` succeeded: drop the deleted session's
    /// runtime. A parked session is removed from the registry; the ACTIVE
    /// session is swapped to the most recent remaining session — or kept as
    /// an unreachable runtime when none remain (its id is gone from the
    /// repository, so the next client attach creates a fresh session).
    async fn handle_session_deleted(&mut self, id: &str, turn: &mut TurnState) {
        if id != self.session.id {
            self.sessions.remove(id);
            return;
        }
        let remaining = match self.session.repository.list().await {
            Ok(records) => records,
            Err(error) => {
                self.error_line(format!(
                    "active session deleted: fallback lookup failed: {error}"
                ));
                return;
            }
        };
        let Some(fallback_id) = remaining.last().map(|record| record.id.clone()) else {
            self.system_line(format!("deleted active session {}; no sessions remain", id));
            return;
        };
        let runtime = match (self.session.factory)(fallback_id.clone()).await {
            Ok(runtime) => runtime,
            Err(error) => {
                self.error_line(format!(
                    "active session deleted: cannot open fallback session {fallback_id}: {error:#}"
                ));
                return;
            }
        };
        if turn.fut.is_some() {
            self.request_abort(turn);
            if let Some(future) = turn.fut.take() {
                let _ = future.await;
            }
        }
        let cwd = runtime.cwd.clone();
        let new_state = SessionRuntimeState::from_runtime(
            runtime,
            self.session.factory.clone(),
            self.session.repository.clone(),
            self.session.retry.clone(),
            self.session.log_path.clone(),
            FeedProjectionState::new(
                self.projection.capabilities.clone(),
                self.projection.thinking_summary.clone(),
            ),
        );
        let old = std::mem::replace(&mut self.session, new_state);
        self.sessions.insert(old);
        if self.runtime.cwd != cwd {
            self.runtime.cwd = cwd;
        }
        self.session
            .kernel
            .harness()
            .session_switched(&self.session.id)
            .await;
        self.automation
            .reload
            .set_trigger_executor(self.session.kernel.trigger_executor().clone());
        self.clear_feed();
        // Resume replay: the fallback runtime rehydrated its transcript, so
        // rebuild the feed from history (capped at `tui_max_feed_lines`).
        crate::feed_replay::replay_transcript(
            &mut self.projection.feed,
            &self.session.kernel.harness().agent().state().messages,
            self.runtime.feed_history_limit,
        );
        self.system_line(format!(
            "deleted session {}; switched to {}",
            id, self.session.id
        ));
        self.session.busy = false;
        self.session.queue.clear();
        self.session.cumulative_usage = WireContextUsage::default();
        self.projection.control_plane_prompt = None;
        turn.aborted = false;
        turn.prefix = "";
        self.refresh_goal_state().await;
        self.publish_current_snapshot().await;
    }

    fn handle_set_credential(
        &mut self,
        request: WireSetCredentialRequest,
    ) -> Result<(), WireRpcError> {
        if request.session_id.trim().is_empty() {
            return Err(WireRpcError {
                code: "invalid_argument".into(),
                message: "session_id must not be empty".into(),
            });
        }
        if request.provider.trim().is_empty() {
            return Err(WireRpcError {
                code: "invalid_argument".into(),
                message: "provider must not be empty".into(),
            });
        }
        self.automation
            .services
            .session_execution
            .set_credential(&request.session_id, &request.provider, request.secret)
            .map_err(|error| match error {
                crate::session_execution::RegistryError::SessionNotRegistered(id) => WireRpcError {
                    code: "not_found".into(),
                    message: format!("session {id} is not registered; activate it first"),
                },
                other => WireRpcError {
                    code: "failed_precondition".into(),
                    message: other.to_string(),
                },
            })
    }

    fn handle_clear_credential(
        &mut self,
        request: WireClearCredentialRequest,
    ) -> Result<(), WireRpcError> {
        let session_id = request.session_id.trim();
        if session_id.is_empty() {
            return Err(WireRpcError {
                code: "invalid_argument".into(),
                message: "session_id must not be empty".into(),
            });
        }
        if self
            .automation
            .services
            .session_execution
            .get(session_id)
            .is_none()
        {
            return Err(WireRpcError {
                code: "not_found".into(),
                message: format!("session {session_id} is not registered; activate it first"),
            });
        }
        match request.provider.as_deref() {
            Some(provider) if provider.trim().is_empty() => Err(WireRpcError {
                code: "invalid_argument".into(),
                message: "provider must not be empty".into(),
            }),
            Some(provider) => {
                self.automation
                    .services
                    .session_execution
                    .clear_credential(session_id, provider);
                Ok(())
            }
            None => {
                self.automation
                    .services
                    .session_execution
                    .clear_credentials(session_id);
                Ok(())
            }
        }
    }

    async fn handle_activate_session(
        &mut self,
        request: WireActivateSessionRequest,
        turn: &mut TurnState,
    ) -> Result<WireActivateSessionResponse, WireRpcError> {
        let current_harness = self.session.kernel.harness().clone();
        let activator = self
            .automation
            .services
            .session_activator
            .get()
            .ok_or_else(|| WireRpcError {
                code: "failed_precondition".into(),
                message: "session activator is not installed".into(),
            })?;
        let activation = activator
            .activate(&request, &current_harness)
            .await?;
        let response = WireActivateSessionResponse {
            session: Some(activation.summary.clone()),
            created: activation.created,
        };
        self.apply_activation(activation, turn).await;
        Ok(response)
    }

    /// Apply a configuration patch on the serialized event loop. Only values
    /// whose runtime applier succeeds are committed to the shared GetConfig
    /// view; transport admission never mutates that view optimistically.
    async fn handle_configure(&mut self, mut config: WireDaemonConfig, turn: &mut TurnState) {
        tracing::info!(
            target: "mcp",
            "configure received: mcp_servers={} clear={:?}",
            config.mcp_servers.len(),
            config.clear_fields
        );
        let unknown = config.unknown_clear_fields();
        if !unknown.is_empty() {
            self.error_line(format!(
                "configure: unknown clear field(s): {}",
                unknown.join(", ")
            ));
            return;
        }

        let mut applied = WireDaemonConfig::default();

        // Issue #136: register controller-provisioned custom models before the
        // model pair is resolved, then seed the credential overlay.
        if !config.models.is_empty() {
            crate::model_defaults::register_models(&config.models);
            applied.models = config.models.clone();
            self.runtime.model_catalog = model_catalog();
        }
        if let Some(raw_key) = config.api_key.as_deref() {
            let provider = config
                .provider
                .as_deref()
                .map(str::trim)
                .filter(|provider| !provider.is_empty())
                .map(str::to_string)
                .or_else(|| {
                    self.session
                        .kernel
                        .harness()
                        .agent()
                        .state()
                        .model
                        .as_ref()
                        .map(|model| model.provider.0.clone())
                });
            match provider {
                Some(provider) => {
                    let key = raw_key.trim();
                    let mut keys = self
                        .automation
                        .services
                        .configured_api_keys
                        .write()
                        .expect("configured api keys poisoned");
                    if key.is_empty() {
                        keys.remove(&provider);
                        drop(keys);
                        applied.clear_fields.push("api_key".into());
                    } else {
                        keys.insert(provider, key.to_string());
                        drop(keys);
                        applied.api_key = Some(raw_key.to_string());
                    }
                }
                None => self.error_line("configure: api_key requires a provider"),
            }
        }
        // Issue #136: `auto_fetch_models = true` fetches the provider catalog
        // and fills an unset model from the first entry. Bounded by the fetch
        // timeout; a failure is reported without failing the rest of the patch.
        if config.auto_fetch_models == Some(true) {
            let provider = config
                .provider
                .as_deref()
                .map(str::trim)
                .filter(|provider| !provider.is_empty())
                .map(str::to_string)
                .or_else(|| {
                    self.session
                        .kernel
                        .harness()
                        .agent()
                        .state()
                        .model
                        .as_ref()
                        .map(|model| model.provider.0.clone())
                });
            let base_url = config.base_url.clone().or_else(|| {
                self.runtime
                    .config
                    .read()
                    .expect("daemon config poisoned")
                    .base_url
                    .clone()
            });
            match (provider, base_url) {
                (Some(provider), Some(base_url)) => {
                    let configured_key = self
                        .automation
                        .services
                        .configured_api_keys
                        .read()
                        .expect("configured api keys poisoned")
                        .get(&provider)
                        .cloned();
                    // Same precedence as the request path: env > configured
                    // (`[model] api_key`) > auth.json.
                    let api_key = theway_transport::auth::AuthStore::load()
                        .unwrap_or_default()
                        .resolve_for_provider_with(&provider, configured_key.as_deref());
                    match crate::model_fetch::fetch_models(&base_url, api_key.as_deref(), &provider)
                        .await
                    {
                        Ok(models) if !models.is_empty() => {
                            let first = models[0].id.clone();
                            crate::model_defaults::register_models(&models);
                            self.runtime.model_catalog = model_catalog();
                            // Fill an unset model id from the catalog; an
                            // explicit model in the same patch wins.
                            if config.model.is_none() {
                                config.provider.get_or_insert(provider);
                                config.model = Some(first);
                            }
                            applied.auto_fetch_models = Some(true);
                            // Report the imported catalog in GetConfig so
                            // clients observe what was registered.
                            applied.models = models;
                        }
                        Ok(_) => self
                            .error_line("configure: auto-fetch models returned an empty catalog"),
                        Err(err) => {
                            self.error_line(format!("configure: auto-fetch models: {err}"));
                        }
                    }
                }
                (None, _) => {
                    self.error_line("configure: auto-fetch models requires a provider")
                }
                (_, None) => {
                    self.error_line("configure: auto-fetch models requires a base_url")
                }
            }
        }

        if (config.clears("provider") && config.provider.is_none())
            || (config.clears("model") && config.model.is_none())
        {
            self.error_line("configure: the active provider/model cannot be cleared");
        } else if config.provider.is_some() != config.model.is_some() {
            self.error_line("configure: provider and model must be supplied together");
        } else if config.provider.is_some()
            || config.base_url.is_some()
            || config.clears("base_url")
        {
            let mut model = match (config.provider.as_deref(), config.model.as_deref()) {
                (Some(provider), Some(id)) => theway_llm_provider::get_model(
                    &theway_llm_provider::Provider::from(provider),
                    id,
                ),
                _ => self.session.kernel.harness().agent().state().model.clone(),
            };
            if config.clears("base_url")
                && let Some(current) = model.as_ref()
            {
                model = theway_llm_provider::get_model(&current.provider, &current.id)
                    .or_else(|| Some(current.clone()));
            }
            if let Some(model) = model.as_mut()
                && let Some(base_url) = config.base_url.as_ref()
            {
                model.base_url = base_url.clone();
            }
            match model {
                Some(model) if self.apply_model(model.clone()).await => {
                    applied.provider = Some(model.provider.0.clone());
                    applied.model = Some(model.id.clone());
                    if model.base_url.is_empty() {
                        applied.clear_fields.push("base_url".into());
                    } else {
                        applied.base_url = Some(model.base_url);
                    }
                }
                Some(_) => {}
                None => self.error_line("configure: no active or matching model to update"),
            }
        }

        if config.thinking.is_some() || config.clears("thinking") {
            let enabled = config.thinking.unwrap_or(false);
            let level = if enabled {
                theway_core::ThinkingLevel::High
            } else {
                theway_core::ThinkingLevel::Off
            };
            match self.session.kernel.harness().set_thinking_level(level).await {
                Ok(_) if config.thinking.is_none() => applied.clear_fields.push("thinking".into()),
                Ok(_) => applied.thinking = Some(enabled),
                Err(err) => self.error_line(format!("configure thinking: {err}")),
            }
        }

        // Full thinking level (persisted last-choice default): applies the
        // exact level, finer-grained than the legacy `thinking` toggle.
        if config.thinking_level.is_some() || config.clears("thinking_level") {
            let requested = config.thinking_level.as_deref();
            let level = match requested {
                Some(raw) => match raw.parse::<theway_core::ThinkingLevel>() {
                    Ok(level) => Some(level),
                    Err(err) => {
                        self.error_line(format!(
                            "configure thinking_level: invalid level {raw:?}: {err}"
                        ));
                        None
                    }
                },
                // Clearing the level falls back to the runtime default (off).
                None => Some(theway_core::ThinkingLevel::Off),
            };
            if let Some(level) = level {
                match self.session.kernel.harness().set_thinking_level(level).await {
                    Ok(_) if requested.is_none() => {
                        applied.clear_fields.push("thinking_level".into())
                    }
                    Ok(_) => applied.thinking_level = config.thinking_level.clone(),
                    Err(err) => self.error_line(format!("configure thinking_level: {err}")),
                }
            }
        }

        if !config.skills.is_empty() || config.clears("skills") {
            // Issue #95: the controller owns skill discovery and provisions
            // the full catalog here. Replace the non-builtin portion of the
            // harness catalog with the provisioned skills (builtins keep
            // their own resolve path below), apply the daemon-owned override
            // state, and record the catalog in the shared slot so `/reload`
            // and `SetSkillDirs` keep the provisioned skills.
            let provisioned: Vec<theway_core::Skill> = config
                .skills
                .iter()
                .map(|skill| theway_core::Skill {
                    name: skill.name.clone(),
                    description: skill.description.clone(),
                    file_path: skill.file_path.clone(),
                    content: skill.content.clone(),
                    disable_model_invocation: skill.disable_model_invocation,
                    source: if skill.source == "project" {
                        theway_core::SkillSource::Project
                    } else {
                        theway_core::SkillSource::User
                    },
                })
                .collect();
            let builtins: Vec<_> = self
                .session
                .kernel
                .harness()
                .skills()
                .into_iter()
                .filter(|skill| matches!(skill.source, theway_core::SkillSource::Builtin))
                .collect();
            let mut merged =
                crate::builtin_skills::merge_with_user_project(builtins, &provisioned);
            let overrides = crate::skill_overrides::load(&self.runtime.paths.base).await;
            crate::skill_overrides::apply(&overrides, &mut merged);
            self.session.kernel.harness().replace_skills(merged);
            *self.runtime.provisioned_skills.write().unwrap() = provisioned.clone();
            if provisioned.is_empty() {
                applied.clear_fields.push("skills".into());
            } else {
                applied.skills = config.skills.clone();
            }
        }

        if !config.templates.is_empty() || config.clears("templates") {
            // Issue #96: the controller owns template discovery and
            // provisions the full catalog here. Templates have no builtin or
            // override layers, so the provisioned list replaces the harness
            // catalog wholesale; the shared slot keeps `/reload` and
            // `SetSkillDirs` from wiping it.
            let provisioned: Vec<theway_core::PromptTemplate> = config
                .templates
                .iter()
                .map(|template| theway_core::PromptTemplate {
                    name: template.name.clone(),
                    description: if template.description.trim().is_empty() {
                        None
                    } else {
                        Some(template.description.clone())
                    },
                    content: template.content.clone(),
                    file_path: template.file_path.clone(),
                })
                .collect();
            self.session.kernel.harness().replace_templates(provisioned.clone());
            *self.runtime.provisioned_templates.write().unwrap() = provisioned.clone();
            if provisioned.is_empty() {
                applied.clear_fields.push("templates".into());
            } else {
                applied.templates = config.templates.clone();
            }
        }

        if !config.mcp_servers.is_empty() || config.clears("mcp_servers") {
            // Issue #73: the controller owns MCP server discovery and
            // provisions the full list here. The daemon connects each
            // server (stdio spawn / streamable HTTP with the auth.json
            // keychain refs), swaps the live harness's MCP tools, registers
            // the fresh notification hooks on the live trigger executor,
            // and publishes per-server failures through the snapshot so
            // the TUI shows its 3s banner + red panel rows.
            let requested: Vec<crate::mcp_loader::ServerConfig> = config
                .mcp_servers
                .iter()
                .map(crate::mcp_loader::server_config_from_wire)
                .collect();
            match crate::mcp_loader::validate_unique_names(&requested) {
                Ok(()) => {
                    let old_tools = self
                        .runtime
                        .mcp_provision
                        .read()
                        .unwrap()
                        .tools
                        .clone();
                    let result = crate::mcp_loader::connect_servers(
                        &requested,
                        &self.runtime.cwd,
                        &self.runtime.paths.base.join("auth.json"),
                    )
                    .await;
                    let (new_tools, new_hooks, capabilities_update) = {
                        let mut slot = self.runtime.mcp_provision.write().unwrap();
                        slot.replace_connection_result(requested, result);
                        let capabilities_update = (
                            slot.server_names.len(),
                            slot.tool_names.len(),
                            slot.server_names.clone(),
                            slot.tool_names.clone(),
                            slot.errors.clone(),
                        );
                        (slot.tools.clone(), slot.hooks.clone(), capabilities_update)
                    };
                    if self.session.mcp_overlay.is_some() {
                        // session-scoped-mcp: this session's MCP set is its own
                        // overlay slot. Re-merge it over the new daemon layer
                        // instead of swapping the raw daemon tools in, so a
                        // session server still shadows a same-name daemon one.
                        self.remerge_active_session_mcp();
                    } else {
                        self.session
                            .kernel
                            .harness()
                            .replace_mcp_tools(&old_tools, new_tools);
                        self.projection.capabilities.mcp_servers = capabilities_update.0;
                        self.projection.capabilities.mcp_tools = capabilities_update.1;
                        self.projection.capabilities.mcp_server_names = capabilities_update.2;
                        self.projection.capabilities.mcp_tool_names = capabilities_update.3;
                        self.projection.capabilities.mcp_server_errors = capabilities_update.4;
                        // Register fresh hooks (new instances every connection)
                        // onto the live session's trigger executor. Hooks are
                        // one-shot; each generation is registered exactly once.
                        {
                            use crate::orchestration::session::NotificationHookSink;
                            use crate::trigger_engine::notification_hook::NotificationHook;
                            let executor = self.runtime.trigger_executor.clone();
                            let mut slot = self.runtime.mcp_provision.write().unwrap();
                            for hook in &new_hooks {
                                let label = hook.label().to_string();
                                if slot.registered_labels.insert(label) {
                                    executor.register(hook.clone());
                                }
                            }
                        }
                    }
                    if config.mcp_servers.is_empty() {
                        applied.clear_fields.push("mcp_servers".into());
                    } else {
                        applied.mcp_servers = config.mcp_servers.clone();
                    }
                    let (connected, failed_count, tool_count, failed_names) = {
                        let slot = self.runtime.mcp_provision.read().unwrap();
                        (
                            slot.server_names.len(),
                            slot.errors.len(),
                            slot.tool_names.len(),
                            slot.errors
                                .iter()
                                .map(|(name, _)| name.as_str())
                                .collect::<Vec<_>>()
                                .join(", "),
                        )
                    };
                    if failed_count == 0 {
                        self.system_line(format!(
                            "MCP: connected {connected} server(s), {tool_count} tool(s)"
                        ));
                    } else {
                        self.system_line(format!(
                            "MCP: connected {connected} server(s), {failed_count} failed: {failed_names}"
                        ));
                    }
                }
                Err(message) => self.error_line(format!("configure mcp_servers: {message}")),
            }
        }

        if !config.builtin_skills.is_empty() || config.clears("builtin_skills") {
            let requested = if config.clears("builtin_skills") && config.builtin_skills.is_empty() {
                Vec::new()
            } else {
                config.builtin_skills.clone()
            };
            let resolved = crate::builtin_skills::resolve_builtins(&[], &requested)
                .expect("an empty CLI list cannot produce a hard builtin error");
            for diagnostic in resolved.diagnostics {
                self.error_line(diagnostic);
            }
            let enabled: Vec<String> = resolved
                .skills
                .iter()
                .map(|skill| skill.name.clone())
                .collect();
            let non_builtin: Vec<_> = self
                .session
                .kernel
                .harness()
                .skills()
                .into_iter()
                .filter(|skill| !matches!(skill.source, theway_core::SkillSource::Builtin))
                .collect();
            self.session.kernel
                .harness()
                .replace_skills(crate::builtin_skills::merge_with_user_project(
                    resolved.skills,
                    &non_builtin,
                ));
            if enabled.is_empty() {
                applied.clear_fields.push("builtin_skills".into());
            } else {
                applied.builtin_skills = enabled;
            }
        }

        if !config.skills_dirs.is_empty() || config.clears("skills_dirs") {
            let dirs = if config.skills_dirs.is_empty() {
                Vec::new()
            } else {
                config.skills_dirs.clone()
            };
            self.handle_set_skill_dirs(dirs, turn).await;
            let actual = self.runtime.path_context.read().unwrap().skills_dirs.clone();
            if actual.is_empty() {
                applied.clear_fields.push("skills_dirs".into());
            } else {
                applied.skills_dirs = actual;
            }
        }

        if let Some(secs) = config.trigger_poll_secs {
            if secs == 0 {
                self.error_line("configure: trigger_poll_secs must be greater than zero");
            } else {
                self.automation.services.dynamic_triggers.set_poll_interval_secs(secs);
                applied.trigger_poll_secs = Some(secs);
            }
        } else if config.clears("trigger_poll_secs") {
            self.automation.services.dynamic_triggers.set_poll_interval_secs(
                theway_transport::triggers::DEFAULT_DYNAMIC_TRIGGER_POLL_INTERVAL_SECS,
            );
            applied.clear_fields.push("trigger_poll_secs".into());
        }

        if let Some(lines) = config.tui_max_feed_lines {
            if lines == 0 {
                self.error_line("configure: tui_max_feed_lines must be greater than zero");
            } else {
                self.runtime.feed_history_limit = Some(lines);
                applied.tui_max_feed_lines = Some(lines);
            }
        } else if config.clears("tui_max_feed_lines") {
            self.runtime.feed_history_limit = None;
            applied.clear_fields.push("tui_max_feed_lines".into());
        }

        if let Some(addr) = config.tool_service_addr.as_ref() {
            if addr.trim().is_empty() {
                self.error_line("configure: tool_service_addr must not be empty; clear it instead");
            } else {
                applied.tool_service_addr = Some(addr.clone());
            }
        } else if config.clears("tool_service_addr") {
            applied.clear_fields.push("tool_service_addr".into());
        }

        if config.storage_service_addr.is_some() || config.clears("storage_service_addr") {
            self.error_line(
                "configure: storage_service_addr is startup-only and cannot be changed at runtime",
            );
        }

        if config.executor_kind.is_some() || config.clears("executor_kind") {
            self.error_line(
                "configure: executor_kind is startup-only and cannot be changed at runtime; set `[executor] kind` in config.toml and restart the daemon",
            );
        }

        if config.tgrep.is_some() || config.clears("tgrep") {
            self.error_line(
                "configure: tgrep is startup-only and cannot be changed at runtime; set `[tools] tgrep` in config.toml and restart the daemon",
            );
        }

        let touched = self.runtime.config.write().unwrap().merge_from(&applied);
        if touched == 0 {
            self.system_line("configure: no applicable settings changed");
        } else {
            self.system_line(format!("configure: applied {touched} setting(s)"));
        }
        // Configure may have supplied the first model for a model-less session;
        // release any queued message that was waiting for one.
        self.start_next_queued_turn(turn);
    }

    /// Apply a `SetSkillDirs` command authoritatively (issue #68): replace
    /// the daemon's extra skill dirs, refresh the shared wire path context,
    /// abort any in-flight turn (its context predates the new catalog), and
    /// hot-reload skills from disk through the harness's reload closure. The
    /// gRPC server applies an optimistic `path_context` update with the same
    /// dirs before enqueuing this command; this step makes it durable.
    async fn handle_set_skill_dirs(&mut self, dirs: Vec<String>, turn: &mut TurnState) {
        let dirs: Vec<PathBuf> = dirs.into_iter().map(PathBuf::from).collect();
        self.runtime.paths.set_extra_skill_dirs(dirs);
        // Keep the shared wire path context in sync with the authoritative
        // value (`GetPathContext` readers observe it immediately).
        self.runtime.path_context.write().unwrap().skills_dirs = self
            .runtime
            .paths
            .current_extra_skill_dirs()
            .into_iter()
            .map(|dir| dir.to_string_lossy().into_owned())
            .collect();
        if turn.fut.is_some() {
            self.request_abort(turn);
        }
        match self.session.kernel.harness().reload_skills_from_disk().await {
            Ok(out) => self.system_line(format!(
                "set skill dirs: {} loaded, {} diagnostics",
                out.skills.len(),
                out.diagnostics.len()
            )),
            Err(e) => self.error_line(format!("set skill dirs: {e:#}")),
        }
    }

    async fn trigger_web_rule_now(&mut self, id: String, turn: &mut TurnState) {
        let id = id.trim();
        if id.is_empty() {
            self.error_line("trigger: missing rule id");
            return;
        }
        let Some(rule) = self.automation.services.dynamic_triggers
            .list()
            .into_iter()
            .find(|rule| rule.id == id)
        else {
            self.error_line(format!("trigger: no dynamic trigger rule with id `{id}`"));
            return;
        };
        let display = format!(
            "trigger now {}: {}",
            feed::truncate_chars(&rule.id, 18),
            wire_preview(&rule.action)
        );
        if turn.fut.is_some() {
            self.queue_user_prompt(display, rule.action, Vec::new())
                .await;
        } else {
            self.projection.feed.push_user(display);
            self.start_user_prompt_turn(rule.action, Vec::new(), turn);
        }
    }
}