feat(curator): archive + prune + list-archived (WS-4)

Catches the Curator surface up to Hermes v0.13's new write-side verbs
(`archive <skill>`, `prune`, `list-archived`, synchronous `run`). Adds
a new `CuratorService` actor in ScarfCore mirroring `KanbanService`'s
pattern (Sendable, pure I/O, `Task.detached(priority: .utility)` per
verb), tolerantly-decoded `HermesCuratorArchivedSkill` /
`CuratorPruneSummary` models, and `CuratorError` for inline-banner
surfacing.

Mac UX gains an "Archived" section between the leaderboards and the
last-report block (per-row Restore button), an "archivebox" button on
every active-skill leaderboard row to manually archive, a destructive
"Prune Archived…" confirm sheet enumerating each skill (template-
uninstall pattern — Cancel owns `.defaultAction`, Prune is on the red
`ScarfDestructiveButton`), and a synchronous-with-progress "Run Now"
on v0.13+ hosts (600s timeout, `ProgressView` while in-flight).
Failure path routes through a yellow inline error banner instead of a
modal alert. The legacy `CuratorRestoreSheet` stays accessible from
the overflow menu but only on pre-v0.13 hosts; on v0.13+ the per-row
Restore in the new Archived section replaces it.

All new surfaces gate on `HermesCapabilities.hasCuratorArchive` —
pre-v0.13 hosts see the v2.7.x layout unchanged. iOS picks up the new
`runNow(synchronous:)` signature with the v0.13 capability flag; the
read-only Archived section + WS-9 marker is left for the next stream.
14 new parser tests in `HermesCuratorParserTests` cover the JSON
happy path, the `{"archived": [...]}` envelope, the text fallback
(`--json` not supported), `"no archived skills"` sentinel folding,
prune-dry-run with both wrapper + bare-array shapes, and zero-skill
prune. All 369 ScarfCore tests pass; `xcodebuild` for the `scarf`
scheme succeeds.

Wire-shape unknowns (CLI flag presence on real v0.13) carry
`// TODO(WS-4-Q<N>)` markers in `CuratorService` and fall back
defensively when a flag isn't recognized. Implements WS-4 of Scarf
v2.8.0 (Hermes v0.13.0 catch-up). Plan:
scarf/docs/v2.8/WS-4-curator-archive-plan.md (on
coordination/v2.8.0-plans).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

scarf/Packages/ScarfCore/Sources/ScarfCore/Models/CuratorError.swift

@@ -0,0 +1,34 @@
+import Foundation
+
+/// Errors thrown by `CuratorService`. Each case carries enough detail
+/// to render a user-actionable message — the view model surfaces these
+/// inline as a banner above the leaderboard rather than blocking with a
+/// modal alert.
+public enum CuratorError: Error, LocalizedError, Sendable {
+    /// `hermes` binary couldn't be located.
+    case cliMissing
+    /// Subprocess returned non-zero exit. `stderr` may carry a synthetic
+    /// message when the transport itself failed.
+    case nonZeroExit(verb: String, code: Int32, stderr: String)
+    /// JSON decoding failed. Underlying message wrapped for diagnostics.
+    case decoding(verb: String, message: String)
+    /// Generic transport error — process couldn't start, IO failed, etc.
+    case transport(message: String)
+
+    public var errorDescription: String? {
+        switch self {
+        case .cliMissing:
+            return "Hermes CLI couldn't be found. Install Hermes v0.13+ and ensure it's on your PATH."
+        case .nonZeroExit(let verb, let code, let stderr):
+            let trimmed = stderr.trimmingCharacters(in: .whitespacesAndNewlines)
+            if trimmed.isEmpty {
+                return "`hermes curator \(verb)` exited with code \(code)."
+            }
+            return trimmed
+        case .decoding(let verb, let message):
+            return "Couldn't decode `hermes curator \(verb)` output: \(message)"
+        case .transport(let message):
+            return message
+        }
+    }
+}

scarf/Packages/ScarfCore/Sources/ScarfCore/Models/GatewayAllowlistKind.swift

@@ -1,76 +0,0 @@
-import Foundation
-
-/// Hermes v0.13 added cross-platform recipient allowlists to the Messaging
-/// Gateway. Each platform stores the list under a different YAML key
-/// depending on the platform's primary noun for "addressable destination":
-///
-/// - **`allowed_channels`** — Slack, Mattermost, Google Chat
-/// - **`allowed_chats`** — Telegram, WhatsApp
-/// - **`allowed_rooms`** — Matrix, DingTalk
-///
-/// `GatewayAllowlistKind` encodes the (platform → key) mapping plus a few
-/// presentation hints (placeholder strings, singular noun) so the allowlist
-/// editor can render the right copy without the per-platform setup view
-/// needing to know the YAML shape.
-public enum GatewayAllowlistKind: String, Sendable, Equatable {
-    case channels   // -> allowed_channels
-    case chats      // -> allowed_chats
-    case rooms      // -> allowed_rooms
-
-    /// YAML scalar key segment under `gateway.platforms.<platform>.<key>`.
-    public var yamlKey: String {
-        switch self {
-        case .channels: return "allowed_channels"
-        case .chats:    return "allowed_chats"
-        case .rooms:    return "allowed_rooms"
-        }
-    }
-
-    /// Placeholder copy for the editor's "add row" text field. Picks the
-    /// most common identifier shape per platform family — Slack channel IDs
-    /// for `channels`, Telegram username/numeric for `chats`, Matrix room
-    /// IDs for `rooms`. Users can paste in any platform-specific format the
-    /// gateway accepts; this is a hint, not validation.
-    public var inputPlaceholder: String {
-        switch self {
-        case .channels: return "C0123ABCD or #channel-name"
-        case .chats:    return "@username or 12345678"
-        case .rooms:    return "!RoomId:matrix.org"
-        }
-    }
-
-    /// Singular noun for prose surfaces ("Add a channel", "1 chat allowed",
-    /// "0 rooms"). Capitalization is the caller's responsibility.
-    public var noun: String {
-        switch self {
-        case .channels: return "channel"
-        case .chats:    return "chat"
-        case .rooms:    return "room"
-        }
-    }
-
-    /// Plural noun for headings + counts.
-    public var pluralNoun: String {
-        switch self {
-        case .channels: return "channels"
-        case .chats:    return "chats"
-        case .rooms:    return "rooms"
-        }
-    }
-
-    /// Map a Hermes platform identifier to the allowlist kind it supports.
-    /// Returns `nil` for platforms without v0.13 allowlist support
-    /// (`cli`, `signal`, `email`, `imessage`, `homeassistant`, `webhook`,
-    /// `yuanbao`, `microsoft-teams`, `feishu`, `discord`).
-    ///
-    /// `googlechat` and `google-chat` both map to `.channels` so we round-trip
-    /// regardless of which spelling Hermes lands on. // TODO(WS-5-Q1)
-    public static func kind(for platform: String) -> GatewayAllowlistKind? {
-        switch platform {
-        case "slack", "mattermost", "google-chat", "googlechat": return .channels
-        case "telegram", "whatsapp":                              return .chats
-        case "matrix", "dingtalk":                                return .rooms
-        default: return nil
-        }
-    }
-}

scarf/Packages/ScarfCore/Sources/ScarfCore/Models/GatewayPlatformSettings.swift

@@ -1,71 +0,0 @@
-import Foundation
-
-/// Per-platform Messaging Gateway settings introduced in Hermes v0.13. Bundles
-/// the allowlist (the platform-appropriate flavor of `allowed_channels` /
-/// `allowed_chats` / `allowed_rooms`) and three behavior toggles
-/// (`busy_ack_enabled`, `gateway_restart_notification`,
-/// `slash_command_notice_ttl_seconds`).
-///
-/// The struct carries all three list fields so a single shape fits every
-/// platform; only the field matching `GatewayAllowlistKind.kind(for:)` is
-/// surfaced in the editor for a given platform. The other two stay empty
-/// and round-trip through the YAML parser unchanged.
-///
-/// **Defaults track Hermes v0.13.** `busyAckEnabled = true`,
-/// `gatewayRestartNotification = false`, `slashCommandNoticeTTLSeconds = 0`
-/// (disabled). An "all-default" instance therefore produces no `gateway:`
-/// block in YAML — see `HermesConfig+YAML` parsing logic which only inserts
-/// an entry into `gatewayPlatforms` when at least one v0.13 key is present
-/// in the file.
-public struct GatewayPlatformSettings: Sendable, Equatable {
-    /// `gateway.platforms.<platform>.allowed_channels` — Slack, Mattermost,
-    /// Google Chat. Empty when the platform doesn't use channels.
-    public var allowedChannels: [String]
-    /// `gateway.platforms.<platform>.allowed_chats` — Telegram, WhatsApp.
-    /// Empty when the platform doesn't use chats.
-    public var allowedChats: [String]
-    /// `gateway.platforms.<platform>.allowed_rooms` — Matrix, DingTalk.
-    /// Empty when the platform doesn't use rooms.
-    public var allowedRooms: [String]
-    /// `gateway.platforms.<platform>.busy_ack_enabled`. Default `true` — set
-    /// to `false` to suppress per-message "agent is working…" acks.
-    public var busyAckEnabled: Bool
-    /// `gateway.platforms.<platform>.gateway_restart_notification`. Default
-    /// `false` — set to `true` to post a "Gateway restarted" notice on boot.
-    public var gatewayRestartNotification: Bool
-    /// `gateway.platforms.<platform>.slash_command_notice_ttl_seconds`.
-    /// Default `0` (disabled). Positive values auto-delete slash-command
-    /// notices after N seconds.
-    public var slashCommandNoticeTTLSeconds: Int
-
-    public init(
-        allowedChannels: [String] = [],
-        allowedChats: [String] = [],
-        allowedRooms: [String] = [],
-        busyAckEnabled: Bool = true,
-        gatewayRestartNotification: Bool = false,
-        slashCommandNoticeTTLSeconds: Int = 0
-    ) {
-        self.allowedChannels = allowedChannels
-        self.allowedChats = allowedChats
-        self.allowedRooms = allowedRooms
-        self.busyAckEnabled = busyAckEnabled
-        self.gatewayRestartNotification = gatewayRestartNotification
-        self.slashCommandNoticeTTLSeconds = slashCommandNoticeTTLSeconds
-    }
-
-    /// All-default instance. `HermesConfig.empty` initializes
-    /// `gatewayPlatforms: [:]` so this is rarely used directly; provided
-    /// for symmetry with the other settings types.
-    public static let empty = GatewayPlatformSettings()
-
-    /// The list field matching this allowlist kind, or `nil` for
-    /// platforms without an allowlist surface.
-    public func items(for kind: GatewayAllowlistKind) -> [String] {
-        switch kind {
-        case .channels: return allowedChannels
-        case .chats:    return allowedChats
-        case .rooms:    return allowedRooms
-        }
-    }
-}

scarf/Packages/ScarfCore/Sources/ScarfCore/Models/HermesConfig.swift

@@ -667,17 +667,6 @@ public struct HermesConfig: Sendable {
     /// useful for cost auditing and screen-recording demos.
     public var runtimeMetadataFooter: Bool
 
-    // -- Hermes v0.13 additions ----------------------------------------
-    // Per-platform Messaging Gateway settings dictionary keyed by Hermes
-    // platform identifier (`slack`, `telegram`, `matrix`, `mattermost`,
-    // `whatsapp`, `dingtalk`, `google-chat`). Populated only for platforms
-    // whose `gateway.platforms.<platform>.*` block exists in config.yaml —
-    // platforms without an explicit block don't appear in the dictionary.
-    // Editing surfaces (per-platform setup forms) read with a `?? .empty`
-    // fallback so a missing entry behaves identically to an all-default
-    // entry.
-    public var gatewayPlatforms: [String: GatewayPlatformSettings]
-
     // Grouped blocks
     public var display: DisplaySettings
     public var terminal: TerminalSettings
@@ -758,13 +747,11 @@ public struct HermesConfig: Sendable {
         homeAssistant: HomeAssistantSettings,
         cacheTTL: String = "5m",
         redactionEnabled: Bool = false,
-        runtimeMetadataFooter: Bool = false,
+        runtimeMetadataFooter: Bool = false
-        gatewayPlatforms: [String: GatewayPlatformSettings] = [:]
     ) {
         self.cacheTTL = cacheTTL
         self.redactionEnabled = redactionEnabled
         self.runtimeMetadataFooter = runtimeMetadataFooter
-        self.gatewayPlatforms = gatewayPlatforms
         self.model = model
         self.provider = provider
         self.maxTurns = maxTurns

scarf/Packages/ScarfCore/Sources/ScarfCore/Models/HermesCuratorArchive.swift

@@ -0,0 +1,124 @@
+import Foundation
+
+/// One entry in the `hermes curator list-archived` output. Decoded
+/// tolerantly via `decodeIfPresent` so a stripped-down host (or a future
+/// Hermes that drops one of the optional columns) doesn't crash the view.
+///
+/// Only `name` is required — every other field is optional and the
+/// computed `*Label` accessors render `"—"` for missing values.
+public struct HermesCuratorArchivedSkill: Sendable, Equatable, Identifiable, Codable {
+    public var id: String { name }
+    public let name: String
+    public let category: String?
+    public let archivedAt: String?
+    public let reason: String?
+    public let sizeBytes: Int?
+    public let path: String?
+
+    public init(
+        name: String,
+        category: String? = nil,
+        archivedAt: String? = nil,
+        reason: String? = nil,
+        sizeBytes: Int? = nil,
+        path: String? = nil
+    ) {
+        self.name = name
+        self.category = category
+        self.archivedAt = archivedAt
+        self.reason = reason
+        self.sizeBytes = sizeBytes
+        self.path = path
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case name
+        case category
+        case archivedAt = "archived_at"
+        case reason
+        case sizeBytes = "size_bytes"
+        case path
+    }
+
+    public init(from decoder: Decoder) throws {
+        let c = try decoder.container(keyedBy: CodingKeys.self)
+        self.name = try c.decode(String.self, forKey: .name)
+        self.category = try c.decodeIfPresent(String.self, forKey: .category)
+        self.archivedAt = try c.decodeIfPresent(String.self, forKey: .archivedAt)
+        self.reason = try c.decodeIfPresent(String.self, forKey: .reason)
+        self.sizeBytes = try c.decodeIfPresent(Int.self, forKey: .sizeBytes)
+        self.path = try c.decodeIfPresent(String.self, forKey: .path)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var c = encoder.container(keyedBy: CodingKeys.self)
+        try c.encode(name, forKey: .name)
+        try c.encodeIfPresent(category, forKey: .category)
+        try c.encodeIfPresent(archivedAt, forKey: .archivedAt)
+        try c.encodeIfPresent(reason, forKey: .reason)
+        try c.encodeIfPresent(sizeBytes, forKey: .sizeBytes)
+        try c.encodeIfPresent(path, forKey: .path)
+    }
+
+    /// "4.4 KB" / "1.2 MB" / "—" for nil. Uses the SI byte formatter so
+    /// the labels match what Finder shows.
+    public var sizeLabel: String {
+        guard let bytes = sizeBytes else { return "—" }
+        let formatter = ByteCountFormatter()
+        formatter.allowedUnits = [.useAll]
+        formatter.countStyle = .file
+        return formatter.string(fromByteCount: Int64(bytes))
+    }
+
+    /// `2026-04-22` (ISO date prefix) / "—". Hermes returns full ISO
+    /// timestamps with seconds + Z; the date prefix is what the user
+    /// actually wants in the archived list.
+    public var archivedAtLabel: String {
+        guard let iso = archivedAt, !iso.isEmpty else { return "—" }
+        // Trim to date prefix if it looks like a full ISO timestamp.
+        if let tIdx = iso.firstIndex(of: "T") {
+            return String(iso[..<tIdx])
+        }
+        return iso
+    }
+}
+
+/// Result of `hermes curator prune --dry-run` — what would be removed
+/// if the user confirms. The view derives `totalCount` from
+/// `wouldRemove.count` so the wire shape stays flat.
+public struct CuratorPruneSummary: Sendable, Equatable, Codable {
+    public let wouldRemove: [HermesCuratorArchivedSkill]
+    public let totalBytes: Int
+    public var totalCount: Int { wouldRemove.count }
+
+    public init(wouldRemove: [HermesCuratorArchivedSkill], totalBytes: Int) {
+        self.wouldRemove = wouldRemove
+        self.totalBytes = totalBytes
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case wouldRemove = "would_remove"
+        case totalBytes = "total_bytes"
+    }
+
+    public init(from decoder: Decoder) throws {
+        let c = try decoder.container(keyedBy: CodingKeys.self)
+        self.wouldRemove = try c.decodeIfPresent([HermesCuratorArchivedSkill].self, forKey: .wouldRemove) ?? []
+        self.totalBytes = try c.decodeIfPresent(Int.self, forKey: .totalBytes) ?? 0
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var c = encoder.container(keyedBy: CodingKeys.self)
+        try c.encode(wouldRemove, forKey: .wouldRemove)
+        try c.encode(totalBytes, forKey: .totalBytes)
+    }
+
+    /// "12.3 KB" / "—" for empty. Convenience for the confirm sheet header.
+    public var totalBytesLabel: String {
+        guard totalBytes > 0 else { return "—" }
+        let formatter = ByteCountFormatter()
+        formatter.allowedUnits = [.useAll]
+        formatter.countStyle = .file
+        return formatter.string(fromByteCount: Int64(totalBytes))
+    }
+}

scarf/Packages/ScarfCore/Sources/ScarfCore/Models/HermesTool.swift

@@ -60,17 +60,6 @@ public enum KnownPlatforms {
         // platform identifiers.
         HermesToolPlatform(name: "yuanbao", displayName: "Yuanbao 元宝", icon: "bubble.left.and.bubble.right.fill"),
         HermesToolPlatform(name: "microsoft-teams", displayName: "Microsoft Teams", icon: "person.2.fill"),
-        // -- v0.13 additions ---------------------------------------------
-        // Google Chat is the 20th gateway platform. It's a generic
-        // `env_enablement_fn` / `cron_deliver_env_var`-driven adapter; setup
-        // runs through `hermes setup` rather than per-field forms because
-        // the auth dance is OAuth-style and lives outside Scarf. Identifier
-        // is `google-chat` (kebab-case, mirroring `microsoft-teams`).
-        // TODO(WS-5-Q1): verify identifier against Hermes v0.13 GA — if it
-        // ships as `googlechat` instead, update both this entry and
-        // `KnownPlatforms.icon(for:)` below. `GatewayAllowlistKind.kind(for:)`
-        // already accepts both spellings defensively.
-        HermesToolPlatform(name: "google-chat", displayName: "Google Chat", icon: "bubble.left.fill"),
     ]
 
     public static func icon(for platform: String) -> String {
@@ -90,7 +79,6 @@ public enum KnownPlatforms {
         case "imessage": return "message.fill"
         case "yuanbao": return "bubble.left.and.bubble.right.fill"
         case "microsoft-teams": return "person.2.fill"
-        case "google-chat", "googlechat": return "bubble.left.fill"
         default: return "bubble.left"
         }
     }

scarf/Packages/ScarfCore/Sources/ScarfCore/Parsing/HermesConfig+YAML.swift

@@ -225,58 +225,6 @@ public extension HermesConfig {
             cooldownSeconds: int("platforms.homeassistant.extra.cooldown_seconds", default: 30)
         )
 
-        // -- v0.13: per-platform Messaging Gateway settings --------------
-        // Read `gateway.platforms.<platform>.{allowed_channels|allowed_chats|
-        // allowed_rooms|busy_ack_enabled|gateway_restart_notification|
-        // slash_command_notice_ttl_seconds}` and bundle each platform that
-        // has at least one v0.13 key present in the file. Platforms without
-        // an explicit block don't appear in the dictionary, so the
-        // editor's `?? .empty` fallback hands the user the v0.13 defaults
-        // without leaving stale keys littered across the YAML.
-        //
-        // TODO(WS-5-Q2): the `gateway.platforms.*` path is unverified —
-        // Hermes v0.13 may emit allowlists under `platforms.<platform>.*`
-        // (sibling to existing `platforms.slack.reply_to_mode`) instead.
-        // If so, swap the `prefix` line below to `"platforms.\(platform)."`
-        // and update `GatewayConfigWriter` in lockstep.
-        let gatewayAllowlistPlatforms = [
-            "slack", "mattermost", "google-chat",
-            "telegram", "whatsapp",
-            "matrix", "dingtalk",
-        ]
-        var gatewayPlatforms: [String: GatewayPlatformSettings] = [:]
-        for platform in gatewayAllowlistPlatforms {
-            let prefix = "gateway.platforms.\(platform)."
-            let allowedChannels = lists[prefix + "allowed_channels"] ?? []
-            let allowedChats    = lists[prefix + "allowed_chats"]    ?? []
-            let allowedRooms    = lists[prefix + "allowed_rooms"]    ?? []
-            let busy            = bool(prefix + "busy_ack_enabled", default: true)
-            let restartNotice   = bool(prefix + "gateway_restart_notification",
-                                       default: false)
-            let ttl             = int(prefix + "slash_command_notice_ttl_seconds",
-                                      default: 0)
-            // Skip platforms with no v0.13 fields present anywhere in the
-            // file. Without this guard, every supported platform would
-            // round-trip an all-default block back through writes even
-            // when the user never touched the new surface.
-            let isEmpty = allowedChannels.isEmpty
-                && allowedChats.isEmpty
-                && allowedRooms.isEmpty
-                && values[prefix + "busy_ack_enabled"] == nil
-                && values[prefix + "gateway_restart_notification"] == nil
-                && values[prefix + "slash_command_notice_ttl_seconds"] == nil
-            if !isEmpty {
-                gatewayPlatforms[platform] = GatewayPlatformSettings(
-                    allowedChannels: allowedChannels,
-                    allowedChats: allowedChats,
-                    allowedRooms: allowedRooms,
-                    busyAckEnabled: busy,
-                    gatewayRestartNotification: restartNotice,
-                    slashCommandNoticeTTLSeconds: ttl
-                )
-            }
-        }
-
         self.init(
             model: str("model.default", default: "unknown"),
             provider: str("model.provider", default: "unknown"),
@@ -336,8 +284,7 @@ public extension HermesConfig {
             homeAssistant: homeAssistant,
             cacheTTL: str("prompt_caching.cache_ttl", default: "5m"),
             redactionEnabled: bool("redaction.enabled", default: false),
-            runtimeMetadataFooter: bool("agent.runtime_metadata_footer", default: false),
+            runtimeMetadataFooter: bool("agent.runtime_metadata_footer", default: false)
-            gatewayPlatforms: gatewayPlatforms
         )
     }
 }

scarf/Packages/ScarfCore/Sources/ScarfCore/Services/CuratorService.swift

@@ -0,0 +1,358 @@
+import Foundation
+#if canImport(os)
+import os
+#endif
+
+/// Async, transport-aware client for `hermes curator …`. Wraps the v0.12
+/// verbs (`status / run / pause / resume / pin / unpin / restore`) plus
+/// the v0.13 archive surface (`archive / prune / list-archived` and a
+/// synchronous-blocking `run`).
+///
+/// **Concurrency.** Pure-I/O `actor` — no UI state. View models hold a
+/// service reference and `await` methods. Each public method dispatches
+/// the underlying CLI invocation through `Task.detached(priority:
+/// .utility)` so two concurrent reads from the VM don't queue end-to-end
+/// on a single thread. Mirrors `KanbanService` shape exactly.
+///
+/// **Capability gating happens at the call site, not in the service.**
+/// `runNow(synchronous:timeout:)` takes a flag from the VM (the VM reads
+/// `HermesCapabilities.hasCuratorArchive` to decide). The service stays
+/// version-agnostic — only the timeout differs in practice.
+public actor CuratorService {
+    #if canImport(os)
+    private static let logger = Logger(subsystem: "com.scarf", category: "CuratorService")
+    #endif
+
+    private let context: ServerContext
+
+    public init(context: ServerContext) {
+        self.context = context
+    }
+
+    // MARK: - Reads
+
+    /// Run `hermes curator status` and parse stdout via
+    /// `HermesCuratorStatusParser`. Combines the text output with the
+    /// on-disk `.curator_state` JSON for richer last-run metadata.
+    /// Never throws — a transport failure resolves to `.empty` so the
+    /// view always has something to render.
+    public func status() async -> HermesCuratorStatus {
+        let context = self.context
+        return await Task.detached(priority: .utility) { () -> HermesCuratorStatus in
+            let textResult = Self.runHermesSync(context: context, args: ["curator", "status"], timeout: 30)
+            let stateData = context.readData(context.paths.curatorStateFile)
+            return HermesCuratorStatusParser.parse(text: textResult.output, stateFileJSON: stateData)
+        }.value
+    }
+
+    /// `hermes curator list-archived [--json]`. Prefers JSON; falls back
+    /// to a defensive text parser. Empty / "no archived skills" sentinel
+    /// folds to `[]`.
+    public func listArchived() async throws -> [HermesCuratorArchivedSkill] {
+        // TODO(WS-4-Q2): confirm `--json` is supported on v0.13
+        // `list-archived`. If not, drop the flag and rely on the text
+        // parser path. Until then we pass `--json` and parse the output
+        // tolerantly.
+        let args = ["curator", "list-archived", "--json"]
+        let (code, stdout, stderr) = await runHermes(args: args, timeout: 30)
+
+        // If --json isn't recognized, the CLI typically emits
+        // "unrecognized arguments: --json" or similar to stderr and
+        // exits non-zero. Retry without the flag and parse text.
+        if code != 0 {
+            let lower = (stderr + stdout).lowercased()
+            if lower.contains("unrecognized") || lower.contains("unknown") || lower.contains("no such option") {
+                let (c2, out2, err2) = await runHermes(args: ["curator", "list-archived"], timeout: 30)
+                try ensureSuccess(code: c2, stdout: out2, stderr: err2, verb: "list-archived")
+                return Self.parseListArchivedText(out2)
+            }
+            try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "list-archived")
+        }
+
+        let trimmed = stdout.trimmingCharacters(in: .whitespacesAndNewlines)
+        if trimmed.isEmpty || trimmed.lowercased().contains("no archived skills") {
+            return []
+        }
+        // Try JSON first — may also be a text dump if Hermes ignored `--json`.
+        if let data = trimmed.data(using: .utf8),
+           let arr = try? JSONDecoder().decode([HermesCuratorArchivedSkill].self, from: data) {
+            return arr
+        }
+        // Some builds wrap in `{"archived": [...]}` envelope.
+        struct Wrapper: Decodable { let archived: [HermesCuratorArchivedSkill] }
+        if let data = trimmed.data(using: .utf8),
+           let wrapped = try? JSONDecoder().decode(Wrapper.self, from: data) {
+            return wrapped.archived
+        }
+        // Text fallback — defensive parse.
+        return Self.parseListArchivedText(stdout)
+    }
+
+    // MARK: - Writes (legacy v0.12 verbs; service form)
+
+    public func runNow(synchronous: Bool, timeout: TimeInterval) async throws {
+        // TODO(WS-4-Q4): default 600s for v0.13 sync runs. No Cancel
+        // button in v2.8 (transport.cancel parity not guaranteed across
+        // LocalTransport / SSHTransport).
+        let resolvedTimeout = synchronous ? timeout : 30
+        let (code, stdout, stderr) = await runHermes(args: ["curator", "run"], timeout: resolvedTimeout)
+        try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "run")
+    }
+
+    public func pause() async throws {
+        let (code, stdout, stderr) = await runHermes(args: ["curator", "pause"], timeout: 15)
+        try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "pause")
+    }
+
+    public func resume() async throws {
+        let (code, stdout, stderr) = await runHermes(args: ["curator", "resume"], timeout: 15)
+        try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "resume")
+    }
+
+    public func pin(_ name: String) async throws {
+        let (code, stdout, stderr) = await runHermes(args: ["curator", "pin", name], timeout: 15)
+        try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "pin")
+    }
+
+    public func unpin(_ name: String) async throws {
+        let (code, stdout, stderr) = await runHermes(args: ["curator", "unpin", name], timeout: 15)
+        try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "unpin")
+    }
+
+    public func restore(_ name: String) async throws {
+        let (code, stdout, stderr) = await runHermes(args: ["curator", "restore", name], timeout: 30)
+        try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "restore")
+    }
+
+    // MARK: - Writes (new in v0.13)
+
+    /// `hermes curator archive <name>` — non-destructive; moves the
+    /// skill from the active set to the archived set. No `--json` is
+    /// expected; the verb's success channel is the exit code.
+    public func archive(_ name: String) async throws {
+        let (code, stdout, stderr) = await runHermes(args: ["curator", "archive", name], timeout: 30)
+        try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "archive")
+    }
+
+    /// `hermes curator prune [--dry-run]`. Destructive when `dryRun`
+    /// is `false` — removes everything currently archived from disk.
+    /// Returns a `CuratorPruneSummary` describing what was (or would be)
+    /// removed. On `dryRun=false`, the wire shape may not include the
+    /// `would_remove` list — the caller should not depend on it; the
+    /// archived list is empty after a successful destructive prune.
+    @discardableResult
+    public func prune(dryRun: Bool) async throws -> CuratorPruneSummary {
+        // TODO(WS-4-Q1): confirm v0.13 ships `--dry-run`. If not, fall
+        // back to enumerating via `list-archived` and treat any prune
+        // call as destructive. The retry-without-flag path below covers
+        // the "unrecognized argument" case automatically.
+        var args = ["curator", "prune"]
+        if dryRun { args.append("--dry-run") }
+        // `--json` requested for the dry-run path so we can parse the
+        // would-remove list. Destructive mode runs without --json since
+        // we only need the exit code.
+        if dryRun { args.append("--json") }
+
+        let (code, stdout, stderr) = await runHermes(args: args, timeout: 60)
+
+        // Detect "unrecognized --dry-run" / "unknown --json" gracefully.
+        if code != 0 {
+            let lower = (stderr + stdout).lowercased()
+            let unrecognized = lower.contains("unrecognized") || lower.contains("unknown") || lower.contains("no such option")
+            if dryRun && unrecognized {
+                // Q1 fallback: enumerate via list-archived. Caller still
+                // uses this summary for confirm-sheet display.
+                let archived = try await listArchived()
+                let total = archived.compactMap { $0.sizeBytes }.reduce(0, +)
+                return CuratorPruneSummary(wouldRemove: archived, totalBytes: total)
+            }
+            try ensureSuccess(code: code, stdout: stdout, stderr: stderr, verb: "prune")
+        }
+
+        if dryRun {
+            return Self.parsePruneDryRun(stdout)
+        }
+        return CuratorPruneSummary(wouldRemove: [], totalBytes: 0)
+    }
+
+    // MARK: - Pure parsers (nonisolated; safe to call from VMs without awaits)
+
+    /// Parse a `list-archived --json` payload. Tolerates the bare-array
+    /// shape, the `{"archived": [...]}` envelope, and "no archived
+    /// skills" / empty-string sentinels. Returns `[]` for any of the
+    /// empty cases. Throws `CuratorError.decoding` only when the input
+    /// is non-empty and clearly not JSON.
+    public nonisolated static func parseListArchived(stdout: String) throws -> [HermesCuratorArchivedSkill] {
+        let trimmed = stdout.trimmingCharacters(in: .whitespacesAndNewlines)
+        if trimmed.isEmpty || trimmed.lowercased().contains("no archived skills") {
+            return []
+        }
+        guard let data = trimmed.data(using: .utf8) else {
+            throw CuratorError.decoding(verb: "list-archived", message: "non-UTF8 stdout")
+        }
+        if let arr = try? JSONDecoder().decode([HermesCuratorArchivedSkill].self, from: data) {
+            return arr
+        }
+        struct Wrapper: Decodable { let archived: [HermesCuratorArchivedSkill] }
+        if let wrapped = try? JSONDecoder().decode(Wrapper.self, from: data) {
+            return wrapped.archived
+        }
+        // Last resort: text fallback.
+        let parsed = parseListArchivedText(stdout)
+        if !parsed.isEmpty {
+            return parsed
+        }
+        throw CuratorError.decoding(verb: "list-archived", message: "stdout was neither JSON nor a recognised text list")
+    }
+
+    /// Defensive text parser for `list-archived` output when `--json`
+    /// isn't supported. Format inferred from `curator status`: one row
+    /// per non-blank line, leading whitespace, name in column 1, then
+    /// optional `archived=YYYY-MM-DD`, `size=NNNN`, `reason=...` k/v
+    /// pairs. Blank lines, header lines, and the empty-state sentinel
+    /// are skipped.
+    public nonisolated static func parseListArchivedText(_ text: String) -> [HermesCuratorArchivedSkill] {
+        var rows: [HermesCuratorArchivedSkill] = []
+        for raw in text.split(separator: "\n") {
+            let line = raw.trimmingCharacters(in: .whitespaces)
+            if line.isEmpty { continue }
+            let lower = line.lowercased()
+            // Skip header / sentinel lines.
+            if lower.hasPrefix("name") && lower.contains("archived") { continue }
+            if lower.contains("no archived skills") { continue }
+            if line.unicodeScalars.allSatisfy({ $0.value == 0x2500 || $0.properties.isWhitespace }) {
+                continue
+            }
+            // Skip lines that look like JSON / non-row chrome — `{`,
+            // `}`, `[`, `]` at the start or quotes / colons mean we're
+            // parsing a malformed JSON dump, not a row table.
+            if let first = line.first, "{[}]\":,".contains(first) {
+                continue
+            }
+            // Find the first whitespace-separated token as the name; if
+            // the name carries an `=` it's a header chip we should skip.
+            let parts = line.split(whereSeparator: { $0 == "\t" || $0 == " " }).map(String.init)
+            guard let name = parts.first, !name.contains("=") else { continue }
+            // Reject names that look like punctuation / JSON fragments.
+            if name.contains("\"") || name.contains(":") || name.contains("{") || name.contains("}") || name.contains("[") || name.contains("]") {
+                continue
+            }
+            // Pull k=v pairs from the remainder.
+            var archivedAt: String?
+            var sizeBytes: Int?
+            var reason: String?
+            var category: String?
+            var path: String?
+            for token in parts.dropFirst() {
+                guard let eq = token.firstIndex(of: "=") else { continue }
+                let key = String(token[..<eq])
+                let value = String(token[token.index(after: eq)...])
+                switch key {
+                case "archived", "archived_at":
+                    archivedAt = value
+                case "size", "size_bytes":
+                    sizeBytes = Int(value)
+                case "reason":
+                    reason = value
+                case "category":
+                    category = value
+                case "path":
+                    path = value
+                default:
+                    continue
+                }
+            }
+            rows.append(
+                HermesCuratorArchivedSkill(
+                    name: name,
+                    category: category,
+                    archivedAt: archivedAt,
+                    reason: reason,
+                    sizeBytes: sizeBytes,
+                    path: path
+                )
+            )
+        }
+        return rows
+    }
+
+    /// Parse a `prune --dry-run --json` payload. Tolerates an empty
+    /// payload (returns a zero summary) and the `{would_remove: [],
+    /// total_bytes: N}` shape.
+    public nonisolated static func parsePruneDryRun(_ stdout: String) -> CuratorPruneSummary {
+        let trimmed = stdout.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else {
+            return CuratorPruneSummary(wouldRemove: [], totalBytes: 0)
+        }
+        if let data = trimmed.data(using: .utf8),
+           let summary = try? JSONDecoder().decode(CuratorPruneSummary.self, from: data) {
+            return summary
+        }
+        // Tolerate a bare-array fallback (some Hermes builds may print
+        // just the would-remove list when --json is missing the wrapper).
+        if let data = trimmed.data(using: .utf8),
+           let arr = try? JSONDecoder().decode([HermesCuratorArchivedSkill].self, from: data) {
+            let total = arr.compactMap { $0.sizeBytes }.reduce(0, +)
+            return CuratorPruneSummary(wouldRemove: arr, totalBytes: total)
+        }
+        // Last-resort text parse for "would remove N skills (X bytes)".
+        return CuratorPruneSummary(wouldRemove: [], totalBytes: 0)
+    }
+
+    // MARK: - CLI invocation
+
+    private nonisolated func runHermes(
+        args: [String],
+        timeout: TimeInterval
+    ) async -> (exitCode: Int32, stdout: String, stderr: String) {
+        let context = self.context
+        return await Task.detached(priority: .utility) { () -> (Int32, String, String) in
+            let result = Self.runHermesSync(context: context, args: args, timeout: timeout)
+            return (result.exitCode, result.output, result.stderr)
+        }.value
+    }
+
+    /// Synchronous, transport-level invocation. `output` is stdout; the
+    /// caller usually only reads `output` for parser input but sometimes
+    /// needs `stderr` (e.g. to detect "unrecognized argument" patterns).
+    private nonisolated static func runHermesSync(
+        context: ServerContext,
+        args: [String],
+        timeout: TimeInterval
+    ) -> (exitCode: Int32, output: String, stderr: String) {
+        let transport = context.makeTransport()
+        do {
+            let result = try transport.runProcess(
+                executable: context.paths.hermesBinary,
+                args: args,
+                stdin: nil,
+                timeout: timeout
+            )
+            return (result.exitCode, result.stdoutString, result.stderrString)
+        } catch let error as TransportError {
+            let message = error.diagnosticStderr.isEmpty
+                ? (error.errorDescription ?? "transport error")
+                : error.diagnosticStderr
+            return (-1, "", message)
+        } catch {
+            return (-1, "", error.localizedDescription)
+        }
+    }
+
+    private nonisolated func ensureSuccess(
+        code: Int32,
+        stdout: String,
+        stderr: String,
+        verb: String
+    ) throws {
+        guard code != 0 else { return }
+        if code == -1 && stderr.lowercased().contains("hermes binary not found") {
+            throw CuratorError.cliMissing
+        }
+        let combined = stderr.isEmpty ? stdout : stderr
+        #if canImport(os)
+        Self.logger.warning("curator \(verb) exit=\(code, privacy: .public) stderr=\(combined, privacy: .public)")
+        #endif
+        throw CuratorError.nonZeroExit(verb: verb, code: code, stderr: combined)
+    }
+}

scarf/Packages/ScarfCore/Sources/ScarfCore/Services/GatewayConfigWriter.swift

@@ -1,396 +0,0 @@
-import Foundation
-
-/// Direct YAML editor for `gateway.platforms.<platform>.allowed_<kind>:` list
-/// blocks. Hermes v0.13 added these list-valued keys, but `hermes config set`
-/// stringifies arrays (the same gotcha that forced Home Assistant's watch
-/// lists to stay read-only). The Messaging Gateway editor sidesteps the CLI
-/// for these keys by editing `~/.hermes/config.yaml` directly.
-///
-/// **Pure-function `setList`** is the heart of the editor — it splits the
-/// YAML into lines, finds (or creates) the targeted block, and splices the
-/// new items in while preserving every byte outside the block. The async
-/// `saveList` wrapper wires it through `ServerContext.readText` /
-/// `writeText`, so the same code path works on `.local` and `.ssh` servers
-/// — local goes through `LocalTransport`, remote round-trips via SCP.
-///
-/// **Scalar fields don't go through here.** `busy_ack_enabled`,
-/// `gateway_restart_notification`, and `slash_command_notice_ttl_seconds`
-/// are scalars that `hermes config set` handles cleanly — `GatewayBehaviorViewModel`
-/// routes those through `PlatformSetupHelpers.saveForm` like every other
-/// platform toggle.
-///
-/// **Why not use a real YAML library?** Same answer as everywhere else in
-/// Scarf: zero external dependencies. The Hermes config flavor is a tightly
-/// scoped subset (indent-based blocks, scalar-or-list values, no anchors /
-/// aliases / flow style), and the targeted edit doesn't need to understand
-/// the full grammar — only "find this block, replace it, preserve the rest".
-public enum GatewayConfigWriter {
-
-    /// Insert or replace `gateway.platforms.<platform>.<key>:` block in the
-    /// YAML, preserving everything else byte-for-byte.
-    ///
-    /// - When `items` is empty, the block (and only the block — siblings
-    ///   stay) is removed from the YAML if present, and the function is a
-    ///   no-op if the block was already absent.
-    /// - When the block is absent and `items` is non-empty, the function
-    ///   appends a `gateway:` / `platforms:` / `<platform>:` scaffold at
-    ///   the end of the file, creating any missing ancestors. This keeps
-    ///   the function idempotent on round-trip but means the new block is
-    ///   appended rather than spliced into an existing top-level
-    ///   `gateway:` section. (See WS-5 plan §Notes for the trade-off; the
-    ///   alternative would mean reflowing existing siblings, which is the
-    ///   exact opposite of "preserve the surrounding YAML byte-for-byte".)
-    /// - When the block is present, its bullet rows are replaced with the
-    ///   new items at the same indent. Items containing YAML-special
-    ///   characters (`:` `#` `@` or leading whitespace) are single-quoted
-    ///   defensively.
-    public static func setList(
-        in yaml: String,
-        platform: String,
-        key: String,
-        items: [String]
-    ) -> String {
-        let blockIndent = 6  // `gateway:\n  platforms:\n    <platform>:\n      <key>:`
-        let itemIndent = 8
-
-        let lines = yaml.components(separatedBy: "\n")
-        let blockHeaderText = "      \(key):"   // indented match for find()
-        let trimmedItems = items.filter { !$0.trimmingCharacters(in: .whitespaces).isEmpty }
-
-        // Locate `      <key>:` whose lineage is gateway → platforms → <platform>.
-        // We find the start of the gateway block, walk down the indent tree, and
-        // bail out if any ancestor is missing.
-        let location = locateBlock(
-            in: lines,
-            platform: platform,
-            key: key
-        )
-
-        switch location {
-        case .found(let blockRange):
-            return replaceBlock(
-                in: lines,
-                blockRange: blockRange,
-                key: key,
-                items: trimmedItems,
-                blockIndent: blockIndent,
-                itemIndent: itemIndent
-            )
-        case .platformPresentKeyMissing(let insertAfter):
-            if trimmedItems.isEmpty {
-                // No-op: empty target, no existing block.
-                return yaml
-            }
-            return spliceNewKey(
-                lines: lines,
-                insertAfterLineIndex: insertAfter,
-                key: key,
-                items: trimmedItems,
-                itemIndent: itemIndent
-            )
-        case .ancestorMissing:
-            if trimmedItems.isEmpty {
-                // Nothing to write, no existing block.
-                return yaml
-            }
-            return appendScaffold(
-                yaml: yaml,
-                platform: platform,
-                key: key,
-                items: trimmedItems
-            )
-        }
-
-        // (unreachable — switch is exhaustive)
-        _ = blockHeaderText
-    }
-
-    /// Async wrapper that reads, mutates, writes via the given context.
-    /// Returns `false` on read or write failure.
-    ///
-    /// The actual I/O happens via `ServerContext.readText` / `writeText`,
-    /// which are `nonisolated` — safe to call from `MainActor` for the
-    /// short config.yaml writes the platform setup forms run. For remote
-    /// hosts the call rounds through SCP under `Task.detached` upstream
-    /// (per Swift 6 concurrency rules in `~/.claude/CLAUDE.md`).
-    public static func saveList(
-        context: ServerContext,
-        platform: String,
-        key: String,
-        items: [String]
-    ) -> Bool {
-        let path = context.paths.configYAML
-        let existing = context.readText(path) ?? ""
-        let updated = setList(in: existing, platform: platform, key: key, items: items)
-        if updated == existing { return true }   // no-op: already correct
-        return context.writeText(path, content: updated)
-    }
-
-    // MARK: - Internals
-
-    /// Result of locating the targeted block in the YAML line array.
-    private enum BlockLocation {
-        /// Block found; the closed range covers the header line + all bullet
-        /// rows attributed to it. Replacing this slice with the new block
-        /// completes the edit.
-        case found(ClosedRange<Int>)
-        /// `gateway → platforms → <platform>` exists, but the leaf `<key>:`
-        /// is absent under it. The associated value is the line index after
-        /// which the new key should be inserted (last line in the platform's
-        /// block, or the platform header itself if the platform's body is
-        /// empty).
-        case platformPresentKeyMissing(insertAfter: Int)
-        /// One of the ancestor section headers is missing. The whole
-        /// scaffold needs to be appended.
-        case ancestorMissing
-    }
-
-    private static func locateBlock(
-        in lines: [String],
-        platform: String,
-        key: String
-    ) -> BlockLocation {
-        // Walk top-to-bottom looking for `gateway:` at indent 0.
-        guard let gatewayIdx = firstIndex(of: lines, headerLineEqualTo: "gateway:", indent: 0) else {
-            return .ancestorMissing
-        }
-        // Inside `gateway:`, find `  platforms:` at indent 2.
-        guard let platformsIdx = firstIndex(
-            of: lines,
-            after: gatewayIdx,
-            headerLineEqualTo: "platforms:",
-            indent: 2,
-            stopWhenIndentLessThan: 2
-        ) else {
-            return .ancestorMissing
-        }
-        // Inside `platforms:`, find `    <platform>:` at indent 4.
-        guard let platformIdx = firstIndex(
-            of: lines,
-            after: platformsIdx,
-            headerLineEqualTo: "\(platform):",
-            indent: 4,
-            stopWhenIndentLessThan: 4
-        ) else {
-            return .ancestorMissing
-        }
-
-        // Inside the platform block, find `<key>:` at indent 6, OR the end
-        // of the platform's body if the key is missing.
-        var keyIdx: Int?
-        var lastBodyIdx = platformIdx
-        var i = platformIdx + 1
-        while i < lines.count {
-            let line = lines[i]
-            let indent = leadingSpaces(line)
-            let trimmed = line.trimmingCharacters(in: .whitespaces)
-            if trimmed.isEmpty || trimmed.hasPrefix("#") {
-                i += 1
-                continue
-            }
-            if indent < 6 {
-                // Out of the platform's block.
-                break
-            }
-            if indent == 6 && trimmed == "\(key):" {
-                keyIdx = i
-                break
-            }
-            lastBodyIdx = i
-            i += 1
-        }
-
-        guard let keyIdx else {
-            return .platformPresentKeyMissing(insertAfter: lastBodyIdx)
-        }
-
-        // Walk down the bullet rows until we leave the block (indent shrinks
-        // below the bullet indent OR we hit a sibling key at indent 6).
-        var endIdx = keyIdx
-        var j = keyIdx + 1
-        while j < lines.count {
-            let line = lines[j]
-            let trimmed = line.trimmingCharacters(in: .whitespaces)
-            if trimmed.isEmpty || trimmed.hasPrefix("#") {
-                j += 1
-                continue
-            }
-            let indent = leadingSpaces(line)
-            // Block-style YAML allows bullets at the same indent as their
-            // parent key; tolerate 6-space `- item` rows alongside the
-            // canonical 8-space ones.
-            let isBullet = trimmed.hasPrefix("- ")
-            if isBullet && (indent == 8 || indent == 6) {
-                endIdx = j
-                j += 1
-                continue
-            }
-            // Anything not a bullet at indent ≥ 8 ends the block.
-            if indent <= 6 {
-                break
-            }
-            // Indent > 8 with no bullet — unusual but tolerate (e.g. inline
-            // continuation). Treat as still in the block and advance.
-            endIdx = j
-            j += 1
-        }
-
-        return .found(keyIdx...endIdx)
-    }
-
-    private static func replaceBlock(
-        in lines: [String],
-        blockRange: ClosedRange<Int>,
-        key: String,
-        items: [String],
-        blockIndent: Int,
-        itemIndent: Int
-    ) -> String {
-        var newLines = Array(lines.prefix(blockRange.lowerBound))
-        if !items.isEmpty {
-            newLines.append("\(spaces(blockIndent))\(key):")
-            for item in items {
-                newLines.append("\(spaces(itemIndent))- \(yamlQuoteIfNeeded(item))")
-            }
-        }
-        // Drop the old block but keep everything after it.
-        let tailStart = blockRange.upperBound + 1
-        if tailStart < lines.count {
-            newLines.append(contentsOf: lines.suffix(from: tailStart))
-        }
-        return newLines.joined(separator: "\n")
-    }
-
-    private static func spliceNewKey(
-        lines: [String],
-        insertAfterLineIndex: Int,
-        key: String,
-        items: [String],
-        itemIndent: Int
-    ) -> String {
-        var newLines = Array(lines.prefix(insertAfterLineIndex + 1))
-        newLines.append("      \(key):")
-        for item in items {
-            newLines.append("\(spaces(itemIndent))- \(yamlQuoteIfNeeded(item))")
-        }
-        if insertAfterLineIndex + 1 < lines.count {
-            newLines.append(contentsOf: lines.suffix(from: insertAfterLineIndex + 1))
-        }
-        return newLines.joined(separator: "\n")
-    }
-
-    private static func appendScaffold(
-        yaml: String,
-        platform: String,
-        key: String,
-        items: [String]
-    ) -> String {
-        var trimmed = yaml
-        // Ensure exactly one trailing newline before the appended block,
-        // so the scaffold sits on its own line cleanly.
-        while trimmed.hasSuffix("\n\n") {
-            trimmed.removeLast()
-        }
-        if !trimmed.isEmpty && !trimmed.hasSuffix("\n") {
-            trimmed.append("\n")
-        }
-        var lines: [String] = []
-        if !trimmed.isEmpty {
-            lines.append("")  // blank separator
-        }
-        lines.append("gateway:")
-        lines.append("  platforms:")
-        lines.append("    \(platform):")
-        lines.append("      \(key):")
-        for item in items {
-            lines.append("        - \(yamlQuoteIfNeeded(item))")
-        }
-        lines.append("")  // trailing newline so subsequent edits append cleanly
-        return trimmed + lines.joined(separator: "\n")
-    }
-
-    // MARK: - YAML scanning helpers
-
-    private static func leadingSpaces(_ line: String) -> Int {
-        var n = 0
-        for c in line {
-            if c == " " { n += 1 } else { break }
-        }
-        return n
-    }
-
-    /// Find the first line whose trimmed content equals `header` AND whose
-    /// leading-space count equals `indent`. Comment-only and blank lines
-    /// are skipped. Returns the line's index or `nil`.
-    private static func firstIndex(
-        of lines: [String],
-        headerLineEqualTo header: String,
-        indent: Int
-    ) -> Int? {
-        for (i, line) in lines.enumerated() {
-            let trimmed = line.trimmingCharacters(in: .whitespaces)
-            if trimmed.isEmpty || trimmed.hasPrefix("#") { continue }
-            if leadingSpaces(line) == indent && trimmed == header {
-                return i
-            }
-        }
-        return nil
-    }
-
-    /// Scoped variant: search starts at `after + 1`, stops if a line at indent
-    /// `< stopWhenIndentLessThan` is encountered (we've left the parent block).
-    private static func firstIndex(
-        of lines: [String],
-        after: Int,
-        headerLineEqualTo header: String,
-        indent: Int,
-        stopWhenIndentLessThan: Int
-    ) -> Int? {
-        var i = after + 1
-        while i < lines.count {
-            let line = lines[i]
-            let trimmed = line.trimmingCharacters(in: .whitespaces)
-            if trimmed.isEmpty || trimmed.hasPrefix("#") {
-                i += 1
-                continue
-            }
-            let lineIndent = leadingSpaces(line)
-            if lineIndent < stopWhenIndentLessThan {
-                return nil
-            }
-            if lineIndent == indent && trimmed == header {
-                return i
-            }
-            i += 1
-        }
-        return nil
-    }
-
-    private static func spaces(_ n: Int) -> String {
-        String(repeating: " ", count: n)
-    }
-
-    /// Quote a YAML scalar if it contains characters that the parser would
-    /// otherwise interpret as structure (colon, hash, leading at-sign, etc.).
-    /// Plain alphanumeric IDs (the common case for Slack channel IDs and
-    /// Telegram numeric chat IDs) are emitted unquoted.
-    private static func yamlQuoteIfNeeded(_ raw: String) -> String {
-        if raw.isEmpty { return "''" }
-        let needsQuoting = raw.contains(":")
-            || raw.contains("#")
-            || raw.contains("&")
-            || raw.contains("*")
-            || raw.contains(">")
-            || raw.contains("|")
-            || raw.first == "@"
-            || raw.first == "-"
-            || raw.first == " "
-            || raw.last == " "
-            || raw.first == "\""
-            || raw.first == "'"
-        if !needsQuoting { return raw }
-        // Single-quote, escaping any embedded single quotes by doubling.
-        let escaped = raw.replacingOccurrences(of: "'", with: "''")
-        return "'\(escaped)'"
-    }
-}

scarf/Packages/ScarfCore/Sources/ScarfCore/Services/HermesGatewayListService.swift

@@ -1,151 +0,0 @@
-import Foundation
-
-/// Cross-profile snapshot returned by `hermes gateway list --json` (Hermes
-/// v0.13+). Each profile is one configured Messaging Gateway instance — most
-/// users have a single `default` profile, but power users keep separate
-/// profiles for work / personal / project-specific accounts.
-public struct GatewayListSnapshot: Sendable, Equatable {
-    public struct ProfileEntry: Sendable, Equatable {
-        public let profile: String
-        public let isRunning: Bool
-        public let pid: Int?
-        public let platforms: [String]   // platform names connected/configured
-
-        public init(
-            profile: String,
-            isRunning: Bool,
-            pid: Int?,
-            platforms: [String]
-        ) {
-            self.profile = profile
-            self.isRunning = isRunning
-            self.pid = pid
-            self.platforms = platforms
-        }
-    }
-    public let profiles: [ProfileEntry]
-    public let detectedAt: Date
-
-    public init(profiles: [ProfileEntry], detectedAt: Date = Date()) {
-        self.profiles = profiles
-        self.detectedAt = detectedAt
-    }
-
-    /// One-line digest for the Messaging Gateway page header. Format depends
-    /// on shape:
-    /// - 0 profiles: `"no profiles configured"`
-    /// - 1 profile, running: `"default profile · running · slack, telegram"`
-    /// - 1 profile, stopped: `"default profile · stopped"`
-    /// - >1 profile: `"3 profiles (2 running) · default: slack, telegram"`
-    public var headerDigest: String {
-        if profiles.isEmpty { return "no profiles configured" }
-
-        if profiles.count == 1 {
-            let p = profiles[0]
-            let state = p.isRunning ? "running" : "stopped"
-            if p.isRunning && !p.platforms.isEmpty {
-                let plats = p.platforms.joined(separator: ", ")
-                return "\(p.profile) profile · \(state) · \(plats)"
-            }
-            return "\(p.profile) profile · \(state)"
-        }
-
-        let runningCount = profiles.filter(\.isRunning).count
-        // Surface the platforms of the first running profile (or first profile
-        // if none are running) so the digest carries one specimen of context
-        // beyond just counts.
-        let highlight = profiles.first(where: \.isRunning) ?? profiles[0]
-        let platsClause: String
-        if highlight.platforms.isEmpty {
-            platsClause = ""
-        } else {
-            platsClause = " · \(highlight.profile): \(highlight.platforms.joined(separator: ", "))"
-        }
-        return "\(profiles.count) profiles (\(runningCount) running)\(platsClause)"
-    }
-}
-
-/// Pure parser + sync fetcher for `hermes gateway list --json`. Pre-v0.13
-/// hosts exit non-zero on the unknown subcommand; the fetcher returns `nil`
-/// in that case so the digest row hides itself.
-///
-/// The detection is **synchronous** — run from a `Task.detached` to avoid
-/// blocking MainActor on remote SSH round-trips. The pure `parse(_:)`
-/// helper has no I/O and can be used in tests against canned JSON.
-public enum HermesGatewayListService {
-
-    /// Parse a JSON blob from `hermes gateway list --json` into a snapshot.
-    /// Tolerant of unknown keys; returns `nil` for unparseable / empty input.
-    ///
-    /// // TODO(WS-5-Q3): the JSON shape below is the plan's best-guess.
-    /// Confirm against actual Hermes v0.13 output once available. Possible
-    /// alternative shapes:
-    /// - root array of profile objects (no `profiles` wrapper)
-    /// - `state` enum string instead of `running` bool
-    /// - `connected_platforms` instead of `platforms`
-    /// The parser is intentionally tolerant so a small shape change can be
-    /// absorbed by tweaking field names without breaking older fixtures.
-    public static func parse(_ json: Data) -> GatewayListSnapshot? {
-        guard !json.isEmpty,
-              let raw = try? JSONSerialization.jsonObject(with: json) else {
-            return nil
-        }
-
-        // Accept both `{"profiles": [...]}` and a bare `[...]` of profiles.
-        let profilesArray: [Any]
-        if let dict = raw as? [String: Any], let arr = dict["profiles"] as? [Any] {
-            profilesArray = arr
-        } else if let arr = raw as? [Any] {
-            profilesArray = arr
-        } else {
-            return nil
-        }
-
-        var entries: [GatewayListSnapshot.ProfileEntry] = []
-        for raw in profilesArray {
-            guard let obj = raw as? [String: Any] else { continue }
-            let profile = (obj["name"] as? String)
-                ?? (obj["profile"] as? String)
-                ?? "default"
-            let isRunning: Bool
-            if let v = obj["running"] as? Bool {
-                isRunning = v
-            } else if let s = obj["state"] as? String {
-                isRunning = s.lowercased() == "running"
-            } else {
-                isRunning = false
-            }
-            let pid = obj["pid"] as? Int
-            let platforms = (obj["platforms"] as? [String])
-                ?? (obj["connected_platforms"] as? [String])
-                ?? []
-            entries.append(GatewayListSnapshot.ProfileEntry(
-                profile: profile,
-                isRunning: isRunning,
-                pid: pid,
-                platforms: platforms
-            ))
-        }
-        return GatewayListSnapshot(profiles: entries)
-    }
-
-    /// Synchronous fetch helper — call from a `Task.detached`. Returns
-    /// `nil` when the subcommand fails (pre-v0.13 host) or when the
-    /// output isn't parseable.
-    public static func fetch(context: ServerContext) -> GatewayListSnapshot? {
-        let transport = context.makeTransport()
-        let executable = context.paths.hermesBinary
-        do {
-            let result = try transport.runProcess(
-                executable: executable,
-                args: ["gateway", "list", "--json"],
-                stdin: nil,
-                timeout: 10
-            )
-            guard result.exitCode == 0 else { return nil }
-            return parse(result.stdout)
-        } catch {
-            return nil
-        }
-    }
-}

scarf/Packages/ScarfCore/Sources/ScarfCore/ViewModels/CuratorViewModel.swift

@@ -4,17 +4,19 @@ import Observation
 import os
 #endif
 
-/// Mac + iOS view model for the v0.12 Curator surface.
+/// Mac + iOS view model for the Curator surface (v0.12 base + v0.13
+/// archive/prune additions).
 ///
 /// Drives `hermes curator status / run / pause / resume / pin / unpin /
-/// restore` plus a parsed view of `~/.hermes/skills/.curator_state`
+/// restore` plus (v0.13+) `archive`, `prune`, `list-archived`. All CLI
-/// JSON. The CLI doesn't ship a `--json` flag for `status`, so we
+/// invocations route through `CuratorService` (the actor) so polling
-/// text-parse stdout (HermesCuratorStatusParser) and use the state
+/// and writes share the same concurrency model and a single error path.
-/// file for richer last-run metadata.
 ///
 /// Capability-gated: callers should construct this only when
-/// `HermesCapabilities.hasCurator` is true. The view model does not
+/// `HermesCapabilities.hasCurator` is true. Archive-aware UI surfaces
-/// gate itself — the gate happens at sidebar/tab routing time.
+/// (Archive button, Archived section, Prune…) gate independently on
+/// `hasCuratorArchive`. The view model itself doesn't gate — it exposes
+/// every method and the View decides what to render.
 @Observable
 @MainActor
 public final class CuratorViewModel {
@@ -27,20 +29,50 @@ public final class CuratorViewModel {
     public private(set) var status: HermesCuratorStatus = .empty
     public private(set) var isLoading = false
     public private(set) var lastReportMarkdown: String?
+
+    // Archive state (v0.13+ only — populated by `loadArchive()` on hosts
+    // where `hasCuratorArchive` is true).
+    public private(set) var archivedSkills: [HermesCuratorArchivedSkill] = []
+    public private(set) var isLoadingArchive = false
+
+    // Prune state — `pruneSummary` non-nil while the confirm sheet is
+    // mid-flight; `isPruning` flips during the destructive step.
+    public private(set) var pruneSummary: CuratorPruneSummary?
+    public private(set) var isPruning = false
+
+    // Track which active-skill row is currently being archived so the
+    // row chrome can show an inline spinner without blocking the rest.
+    public private(set) var pendingArchiveName: String?
+
+    /// Happy-path success toast ("Pinned X", "Resumed", "Archived
+    /// legacy-helper"). Auto-clears 3s after assignment.
     public var transientMessage: String?
 
+    /// Failure path — populated by every CLI verb when it throws. Shown
+    /// as an inline yellow banner above the status summary so users
+    /// don't have to dismiss a modal alert during a high-frequency
+    /// surface like the leaderboard. Manually dismissed via the View's
+    /// "x" button (sets to nil).
+    public var errorMessage: String?
+
+    @ObservationIgnored
+    private let service: CuratorService
+
     public init(context: ServerContext) {
         self.context = context
+        self.service = CuratorService(context: context)
     }
 
+    // MARK: - Loads
+
     public func load() async {
         isLoading = true
         defer { isLoading = false }
         let context = self.context
         // v2.8 — instrumented. Curator load fires `hermes curator
-        // status` (CLI subprocess) plus 1-2 file reads; on remote
+        // status` (CLI subprocess) plus 1-2 file reads; on remote each
-        // each is a separate SSH RTT. Visibility lets future captures
+        // is a separate SSH RTT. Visibility lets future captures show
-        // show how often the report file is missing or oversized.
+        // how often the report file is missing or oversized.
         let parsed = await ScarfMon.measureAsync(.diskIO, "curator.load") {
             await Task.detached(priority: .userInitiated) { () -> (HermesCuratorStatus, String?) in
                 let textResult = Self.runCuratorStatus(context: context)
@@ -69,46 +101,156 @@ public final class CuratorViewModel {
         self.lastReportMarkdown = parsed.1
     }
 
-    public func runNow() async {
+    /// Refresh the archived-skills list. No-op on hosts without
-        await runAndReload(args: ["curator", "run"], successMessage: "Curator run started")
+    /// `hasCuratorArchive` — the caller gates the call.
+    public func loadArchive() async {
+        isLoadingArchive = true
+        defer { isLoadingArchive = false }
+        do {
+            archivedSkills = try await service.listArchived()
+        } catch {
+            archivedSkills = []
+            errorMessage = (error as? LocalizedError)?.errorDescription
+                ?? error.localizedDescription
+        }
+    }
+
+    // MARK: - Writes (v0.12)
+
+    /// Run the curator manually. On v0.13+ hosts this blocks for the
+    /// duration of the run (default 600s timeout); pre-v0.13 returns
+    /// immediately. Caller passes the capability-decided flag.
+    public func runNow(synchronous: Bool, timeout: TimeInterval = 600) async {
+        await runWithReload(
+            verb: "run",
+            successMessage: synchronous ? "Curator run complete" : "Curator run started"
+        ) {
+            try await self.service.runNow(synchronous: synchronous, timeout: timeout)
+        }
     }
 
     public func pause() async {
-        await runAndReload(args: ["curator", "pause"], successMessage: "Curator paused")
+        await runWithReload(verb: "pause", successMessage: "Curator paused") {
+            try await self.service.pause()
+        }
     }
 
     public func resume() async {
-        await runAndReload(args: ["curator", "resume"], successMessage: "Curator resumed")
+        await runWithReload(verb: "resume", successMessage: "Curator resumed") {
+            try await self.service.resume()
+        }
     }
 
     public func pin(_ skill: String) async {
-        await runAndReload(args: ["curator", "pin", skill], successMessage: "Pinned \(skill)")
+        await runWithReload(verb: "pin", successMessage: "Pinned \(skill)") {
+            try await self.service.pin(skill)
+        }
     }
 
     public func unpin(_ skill: String) async {
-        await runAndReload(args: ["curator", "unpin", skill], successMessage: "Unpinned \(skill)")
+        await runWithReload(verb: "unpin", successMessage: "Unpinned \(skill)") {
+            try await self.service.unpin(skill)
+        }
     }
 
     public func restore(_ skill: String) async {
-        await runAndReload(args: ["curator", "restore", skill], successMessage: "Restored \(skill)")
+        await runWithReload(verb: "restore", successMessage: "Restored \(skill)") {
+            try await self.service.restore(skill)
+        }
+        // Restore drops the entry from the archived list — refresh it
+        // so the row disappears immediately.
+        await loadArchive()
     }
 
-    private func runAndReload(args: [String], successMessage: String) async {
+    // MARK: - Writes (v0.13)
-        let context = self.context
+
-        let exitCode = await Task.detached(priority: .userInitiated) {
+    public func archive(_ skill: String) async {
-            Self.runHermes(context: context, args: args).exitCode
+        pendingArchiveName = skill
-        }.value
+        await runWithReload(verb: "archive", successMessage: "Archived \(skill)") {
-        transientMessage = exitCode == 0 ? successMessage : "Command failed"
+            try await self.service.archive(skill)
-        await load()
+        }
-        // Auto-clear toast after 3s.
+        pendingArchiveName = nil
+        await loadArchive()
+    }
+
+    /// Stage 1 of the bulk-prune flow. Calls `prune --dry-run` and
+    /// populates `pruneSummary`; the View binds its confirm sheet to
+    /// the non-nil presence of this property.
+    public func planPrune() async {
+        do {
+            pruneSummary = try await service.prune(dryRun: true)
+        } catch {
+            errorMessage = (error as? LocalizedError)?.errorDescription
+                ?? error.localizedDescription
+            pruneSummary = nil
+        }
+    }
+
+    /// Stage 2 of the bulk-prune flow. Destructive — removes everything
+    /// currently archived. Clears `pruneSummary` regardless of outcome
+    /// so the confirm sheet dismisses.
+    public func confirmPrune() async {
+        isPruning = true
+        do {
+            _ = try await service.prune(dryRun: false)
+            transientMessage = "Pruned archived skills"
+            errorMessage = nil
+            await loadArchive()
+            await load()
+            scheduleTransientClear()
+        } catch {
+            errorMessage = (error as? LocalizedError)?.errorDescription
+                ?? error.localizedDescription
+        }
+        isPruning = false
+        pruneSummary = nil
+    }
+
+    /// Cancel the in-flight prune-confirm flow without running.
+    public func cancelPrune() {
+        pruneSummary = nil
+    }
+
+    /// User-driven dismissal of the inline error banner.
+    public func dismissError() {
+        errorMessage = nil
+    }
+
+    // MARK: - Helpers
+
+    /// Run a service call, route success → `transientMessage`, failure
+    /// → `errorMessage`, and reload `status` either way. Mirrors the
+    /// previous `runAndReload` helper but goes through the typed
+    /// service surface.
+    private func runWithReload(
+        verb: String,
+        successMessage: String,
+        body: @escaping @Sendable () async throws -> Void
+    ) async {
+        do {
+            try await body()
+            transientMessage = successMessage
+            errorMessage = nil
+            await load()
+            scheduleTransientClear()
+        } catch {
+            let message = (error as? LocalizedError)?.errorDescription
+                ?? error.localizedDescription
+            errorMessage = message
+            transientMessage = nil
+            await load()
+        }
+    }
+
+    private func scheduleTransientClear() {
         Task { @MainActor [weak self] in
             try? await Task.sleep(nanoseconds: 3_000_000_000)
             self?.transientMessage = nil
         }
     }
 
-    /// Wrap the transport-level `runProcess` so the call sites don't
+    // MARK: - Legacy sync helpers (kept for `load`'s detached path)
-    /// have to reach for it directly. Combined stdout+stderr.
+
     nonisolated private static func runHermes(
         context: ServerContext,
         args: [String]

scarf/Packages/ScarfCore/Tests/ScarfCoreTests/GatewayAllowlistKindTests.swift

@@ -1,70 +0,0 @@
-import Testing
-import Foundation
-@testable import ScarfCore
-
-/// Pure mapping tests for `GatewayAllowlistKind`. Locks down the (platform →
-/// kind) table so a refactor doesn't accidentally drop a platform.
-@Suite struct GatewayAllowlistKindTests {
-
-    @Test func mapsKnownPlatformsToCorrectKind() {
-        #expect(GatewayAllowlistKind.kind(for: "slack")      == .channels)
-        #expect(GatewayAllowlistKind.kind(for: "mattermost") == .channels)
-        #expect(GatewayAllowlistKind.kind(for: "google-chat") == .channels)
-        #expect(GatewayAllowlistKind.kind(for: "telegram")   == .chats)
-        #expect(GatewayAllowlistKind.kind(for: "whatsapp")   == .chats)
-        #expect(GatewayAllowlistKind.kind(for: "matrix")     == .rooms)
-        #expect(GatewayAllowlistKind.kind(for: "dingtalk")   == .rooms)
-    }
-
-    @Test func acceptsBothGoogleChatSpellings() {
-        // // TODO(WS-5-Q1) — both spellings round-trip until Hermes confirms
-        // the wire identifier.
-        #expect(GatewayAllowlistKind.kind(for: "google-chat") == .channels)
-        #expect(GatewayAllowlistKind.kind(for: "googlechat")  == .channels)
-    }
-
-    @Test func returnsNilForPlatformsWithoutAllowlist() {
-        #expect(GatewayAllowlistKind.kind(for: "cli")            == nil)
-        #expect(GatewayAllowlistKind.kind(for: "yuanbao")        == nil)
-        #expect(GatewayAllowlistKind.kind(for: "microsoft-teams") == nil)
-        #expect(GatewayAllowlistKind.kind(for: "discord")        == nil)
-        #expect(GatewayAllowlistKind.kind(for: "signal")         == nil)
-        #expect(GatewayAllowlistKind.kind(for: "homeassistant")  == nil)
-        #expect(GatewayAllowlistKind.kind(for: "")               == nil)
-        #expect(GatewayAllowlistKind.kind(for: "unknown")        == nil)
-    }
-
-    @Test func yamlKeyMatchesHermesContract() {
-        #expect(GatewayAllowlistKind.channels.yamlKey == "allowed_channels")
-        #expect(GatewayAllowlistKind.chats.yamlKey    == "allowed_chats")
-        #expect(GatewayAllowlistKind.rooms.yamlKey    == "allowed_rooms")
-    }
-
-    @Test func nounsAreUserFacingSafe() {
-        #expect(GatewayAllowlistKind.channels.noun == "channel")
-        #expect(GatewayAllowlistKind.chats.noun    == "chat")
-        #expect(GatewayAllowlistKind.rooms.noun    == "room")
-        #expect(GatewayAllowlistKind.channels.pluralNoun == "channels")
-        #expect(GatewayAllowlistKind.chats.pluralNoun    == "chats")
-        #expect(GatewayAllowlistKind.rooms.pluralNoun    == "rooms")
-    }
-
-    @Test func placeholdersAreNonEmpty() {
-        // Smoke test — placeholder strings are advisory; we just don't want
-        // them silently emptied during a refactor.
-        #expect(!GatewayAllowlistKind.channels.inputPlaceholder.isEmpty)
-        #expect(!GatewayAllowlistKind.chats.inputPlaceholder.isEmpty)
-        #expect(!GatewayAllowlistKind.rooms.inputPlaceholder.isEmpty)
-    }
-
-    @Test func gatewayPlatformSettingsItemsForKind() {
-        let s = GatewayPlatformSettings(
-            allowedChannels: ["C01"],
-            allowedChats: ["@user"],
-            allowedRooms: ["!room:matrix.org"]
-        )
-        #expect(s.items(for: .channels) == ["C01"])
-        #expect(s.items(for: .chats)    == ["@user"])
-        #expect(s.items(for: .rooms)    == ["!room:matrix.org"])
-    }
-}

scarf/Packages/ScarfCore/Tests/ScarfCoreTests/GatewayConfigWriterTests.swift

@@ -1,276 +0,0 @@
-import Testing
-import Foundation
-@testable import ScarfCore
-
-/// Round-trip + idempotence tests for `GatewayConfigWriter.setList`. Pure
-/// `String` operations only — runs cleanly on Linux SwiftPM.
-@Suite struct GatewayConfigWriterTests {
-
-    // MARK: - Insert
-
-    @Test func setListInsertsBlockOnEmpty() {
-        let yaml = ""
-        let updated = GatewayConfigWriter.setList(
-            in: yaml,
-            platform: "slack",
-            key: "allowed_channels",
-            items: ["C0123ABCD", "C0456EFGH"]
-        )
-        #expect(updated.contains("gateway:"))
-        #expect(updated.contains("  platforms:"))
-        #expect(updated.contains("    slack:"))
-        #expect(updated.contains("      allowed_channels:"))
-        #expect(updated.contains("- C0123ABCD"))
-        #expect(updated.contains("- C0456EFGH"))
-    }
-
-    @Test func setListAppendsScaffoldPreservingPriorContent() {
-        let yaml = """
-        model:
-          default: gpt-4o
-          provider: openai
-        """
-        let updated = GatewayConfigWriter.setList(
-            in: yaml,
-            platform: "slack",
-            key: "allowed_channels",
-            items: ["C01"]
-        )
-        // Original content preserved verbatim at the top.
-        #expect(updated.contains("model:"))
-        #expect(updated.contains("  default: gpt-4o"))
-        #expect(updated.contains("  provider: openai"))
-        // New scaffold appended.
-        #expect(updated.contains("gateway:"))
-        #expect(updated.contains("    slack:"))
-        #expect(updated.contains("- C01"))
-    }
-
-    // MARK: - Replace
-
-    @Test func setListReplacesExistingBlock() {
-        let yaml = """
-        gateway:
-          platforms:
-            slack:
-              allowed_channels:
-                - C_OLD_1
-                - C_OLD_2
-        """
-        let updated = GatewayConfigWriter.setList(
-            in: yaml,
-            platform: "slack",
-            key: "allowed_channels",
-            items: ["C_NEW_1"]
-        )
-        #expect(updated.contains("- C_NEW_1"))
-        #expect(!updated.contains("- C_OLD_1"))
-        #expect(!updated.contains("- C_OLD_2"))
-    }
-
-    @Test func setListPreservesScalarSiblings() {
-        // The `busy_ack_enabled` scalar sibling of `allowed_channels` must
-        // stay byte-for-byte after a list-write to the same platform.
-        let yaml = """
-        gateway:
-          platforms:
-            slack:
-              allowed_channels:
-                - C_OLD
-              busy_ack_enabled: false
-              gateway_restart_notification: true
-        """
-        let updated = GatewayConfigWriter.setList(
-            in: yaml,
-            platform: "slack",
-            key: "allowed_channels",
-            items: ["C_NEW"]
-        )
-        #expect(updated.contains("- C_NEW"))
-        #expect(!updated.contains("- C_OLD"))
-        // Scalars at the same indent must survive.
-        #expect(updated.contains("busy_ack_enabled: false"))
-        #expect(updated.contains("gateway_restart_notification: true"))
-    }
-
-    @Test func setListPreservesOtherPlatformsBlocks() {
-        // Editing slack must not touch matrix.
-        let yaml = """
-        gateway:
-          platforms:
-            slack:
-              allowed_channels:
-                - C_SLACK
-            matrix:
-              allowed_rooms:
-                - '!room1:matrix.org'
-                - '!room2:matrix.org'
-        """
-        let updated = GatewayConfigWriter.setList(
-            in: yaml,
-            platform: "slack",
-            key: "allowed_channels",
-            items: ["C_SLACK_NEW"]
-        )
-        #expect(updated.contains("- C_SLACK_NEW"))
-        // Matrix block intact.
-        #expect(updated.contains("    matrix:"))
-        #expect(updated.contains("'!room1:matrix.org'"))
-        #expect(updated.contains("'!room2:matrix.org'"))
-    }
-
-    // MARK: - Remove
-
-    @Test func setListWithEmptyItemsRemovesBlock() {
-        let yaml = """
-        gateway:
-          platforms:
-            slack:
-              allowed_channels:
-                - C01
-                - C02
-              busy_ack_enabled: true
-        """
-        let updated = GatewayConfigWriter.setList(
-            in: yaml,
-            platform: "slack",
-            key: "allowed_channels",
-            items: []
-        )
-        // Block removed; sibling scalar preserved.
-        #expect(!updated.contains("allowed_channels:"))
-        #expect(!updated.contains("- C01"))
-        #expect(!updated.contains("- C02"))
-        #expect(updated.contains("busy_ack_enabled: true"))
-    }
-
-    @Test func setListWithEmptyItemsOnAbsentBlockIsNoOp() {
-        let yaml = """
-        model:
-          default: gpt-4o
-        """
-        let updated = GatewayConfigWriter.setList(
-            in: yaml,
-            platform: "slack",
-            key: "allowed_channels",
-            items: []
-        )
-        #expect(updated == yaml)
-    }
-
-    // MARK: - Idempotence
-
-    @Test func setListIsIdempotent() {
-        let yaml = """
-        model:
-          default: gpt-4o
-        """
-        let once = GatewayConfigWriter.setList(
-            in: yaml,
-            platform: "telegram",
-            key: "allowed_chats",
-            items: ["@alice", "@bob"]
-        )
-        let twice = GatewayConfigWriter.setList(
-            in: once,
-            platform: "telegram",
-            key: "allowed_chats",
-            items: ["@alice", "@bob"]
-        )
-        #expect(once == twice)
-    }
-
-    @Test func setListReplaceThenReplaceIsStable() {
-        let yaml = ""
-        let a = GatewayConfigWriter.setList(
-            in: yaml, platform: "matrix", key: "allowed_rooms",
-            items: ["!a:m", "!b:m"]
-        )
-        let b = GatewayConfigWriter.setList(
-            in: a, platform: "matrix", key: "allowed_rooms",
-            items: ["!c:m"]
-        )
-        #expect(b.contains("- '!c:m'"))
-        #expect(!b.contains("'!a:m'"))
-        #expect(!b.contains("'!b:m'"))
-    }
-
-    // MARK: - Quoting
-
-    @Test func setListQuotesItemsContainingColons() {
-        // Matrix room IDs contain `:` — must be single-quoted.
-        let yaml = ""
-        let updated = GatewayConfigWriter.setList(
-            in: yaml, platform: "matrix", key: "allowed_rooms",
-            items: ["!RoomId:matrix.org"]
-        )
-        #expect(updated.contains("'!RoomId:matrix.org'"))
-    }
-
-    @Test func setListQuotesItemsStartingWithAt() {
-        // Telegram usernames `@alice`.
-        let yaml = ""
-        let updated = GatewayConfigWriter.setList(
-            in: yaml, platform: "telegram", key: "allowed_chats",
-            items: ["@alice"]
-        )
-        #expect(updated.contains("'@alice'"))
-    }
-
-    @Test func setListLeavesPlainAlphanumericUnquoted() {
-        // Slack channel IDs are A-Z0-9 — emit unquoted for readability.
-        let yaml = ""
-        let updated = GatewayConfigWriter.setList(
-            in: yaml, platform: "slack", key: "allowed_channels",
-            items: ["C0123ABCD"]
-        )
-        #expect(updated.contains("- C0123ABCD"))
-        #expect(!updated.contains("'C0123ABCD'"))
-    }
-
-    @Test func setListEscapesEmbeddedSingleQuotes() {
-        let yaml = ""
-        let updated = GatewayConfigWriter.setList(
-            in: yaml, platform: "slack", key: "allowed_channels",
-            items: ["weird:'name"]
-        )
-        // Embedded single quote doubled per YAML spec.
-        #expect(updated.contains("'weird:''name'"))
-    }
-
-    // MARK: - Insertion when ancestors exist but key is absent
-
-    @Test func setListInsertsKeyUnderExistingPlatformBlock() {
-        // `gateway → platforms → slack` exists with a busy_ack_enabled
-        // scalar; `allowed_channels` is missing. Add it without disturbing
-        // the scalar sibling.
-        let yaml = """
-        gateway:
-          platforms:
-            slack:
-              busy_ack_enabled: false
-        """
-        let updated = GatewayConfigWriter.setList(
-            in: yaml, platform: "slack", key: "allowed_channels",
-            items: ["C42"]
-        )
-        #expect(updated.contains("busy_ack_enabled: false"))
-        #expect(updated.contains("allowed_channels:"))
-        #expect(updated.contains("- C42"))
-    }
-
-    // MARK: - Round-trip with the YAML loader
-
-    @Test func roundTripsThroughHermesConfigYAMLLoader() {
-        // Write a list, then parse the result through HermesConfig+YAML and
-        // confirm we read back what we wrote.
-        var yaml = ""
-        yaml = GatewayConfigWriter.setList(
-            in: yaml, platform: "slack", key: "allowed_channels",
-            items: ["C01", "C02"]
-        )
-        let cfg = HermesConfig(yaml: yaml)
-        let block = cfg.gatewayPlatforms["slack"]
-        #expect(block?.allowedChannels == ["C01", "C02"])
-    }
-}

scarf/Packages/ScarfCore/Tests/ScarfCoreTests/HermesCuratorParserTests.swift

@@ -151,4 +151,169 @@ import Foundation
         #expect(parsed?.patchCount == 2)
         #expect(parsed?.lastActivityLabel == "2026-04-25")
     }
+
+    // MARK: - v0.13 list-archived / prune fixtures (WS-4)
+
+    /// Empty JSON array → `[]`. Locks in the happy-path no-archives shape.
+    @Test func listArchivedEmpty() throws {
+        let result = try CuratorService.parseListArchived(stdout: "[]")
+        #expect(result.isEmpty)
+    }
+
+    /// Three archives with full optional fields. Asserts each
+    /// optional value decodes through `decodeIfPresent` and that
+    /// the computed labels resolve.
+    @Test func listArchivedThreeSkills() throws {
+        let json = """
+        [
+          {
+            "name": "legacy-helper",
+            "category": "templates",
+            "archived_at": "2026-04-22T03:14:09Z",
+            "reason": "stale: 91d unused",
+            "size_bytes": 4521,
+            "path": "/Users/u/.hermes/skills/.archived/legacy-helper"
+          },
+          {
+            "name": "old-translator",
+            "category": "user",
+            "archived_at": "2026-04-23T10:00:00Z",
+            "reason": "consolidated with translator",
+            "size_bytes": 8192
+          },
+          {
+            "name": "minimal"
+          }
+        ]
+        """
+        let result = try CuratorService.parseListArchived(stdout: json)
+        #expect(result.count == 3)
+        #expect(result[0].name == "legacy-helper")
+        #expect(result[0].category == "templates")
+        #expect(result[0].reason == "stale: 91d unused")
+        #expect(result[0].sizeBytes == 4521)
+        #expect(result[0].archivedAtLabel == "2026-04-22")
+        #expect(result[0].path == "/Users/u/.hermes/skills/.archived/legacy-helper")
+
+        // Tolerant: only `name` set on the third row.
+        #expect(result[2].name == "minimal")
+        #expect(result[2].category == nil)
+        #expect(result[2].reason == nil)
+        #expect(result[2].archivedAtLabel == "—")
+        #expect(result[2].sizeLabel == "—")
+    }
+
+    /// `{"archived": [...]}` envelope is also accepted.
+    @Test func listArchivedEnvelope() throws {
+        let json = """
+        {"archived": [
+          {"name": "envelope-skill", "size_bytes": 1024}
+        ]}
+        """
+        let result = try CuratorService.parseListArchived(stdout: json)
+        #expect(result.count == 1)
+        #expect(result[0].name == "envelope-skill")
+    }
+
+    /// Text fallback when `--json` isn't supported. Each row carries
+    /// the name in column 1 plus k=v chips for the optional fields.
+    @Test func listArchivedTextFallback() {
+        let text = """
+          legacy-helper      archived=2026-04-22 size=4521 reason=stale
+          old-translator     archived=2026-04-23 size=8192
+          minimal-row
+        """
+        let result = CuratorService.parseListArchivedText(text)
+        #expect(result.count == 3)
+        #expect(result[0].name == "legacy-helper")
+        #expect(result[0].archivedAt == "2026-04-22")
+        #expect(result[0].sizeBytes == 4521)
+        #expect(result[0].reason == "stale")
+        #expect(result[2].name == "minimal-row")
+        #expect(result[2].sizeBytes == nil)
+    }
+
+    /// Empty-state sentinel folds to `[]` (parallel to KanbanService's
+    /// `"no matching tasks"` handling).
+    @Test func listArchivedNoArchivedSentinel() throws {
+        let result = try CuratorService.parseListArchived(stdout: "no archived skills\n")
+        #expect(result.isEmpty)
+    }
+
+    /// Whitespace-only stdout also folds to empty.
+    @Test func listArchivedWhitespaceFoldsToEmpty() throws {
+        let result = try CuratorService.parseListArchived(stdout: "   \n\n")
+        #expect(result.isEmpty)
+    }
+
+    /// Decode failure (clearly non-JSON, non-text) throws. We accept
+    /// JSON, the envelope, the empty sentinel, or text rows; anything
+    /// else surfaces as a `CuratorError.decoding`.
+    @Test func listArchivedNonsenseThrows() throws {
+        do {
+            _ = try CuratorService.parseListArchived(stdout: "{garbage")
+            Issue.record("expected decoding throw")
+        } catch let error as CuratorError {
+            if case .decoding = error {
+                // expected
+            } else {
+                Issue.record("unexpected error \(error)")
+            }
+        }
+    }
+
+    /// Prune-dry-run JSON with `would_remove` + `total_bytes`.
+    @Test func pruneDryRunHappyPath() {
+        let json = """
+        {
+          "would_remove": [
+            {"name": "stale-a", "size_bytes": 1000},
+            {"name": "stale-b", "size_bytes": 2000}
+          ],
+          "total_bytes": 3000
+        }
+        """
+        let summary = CuratorService.parsePruneDryRun(json)
+        #expect(summary.totalCount == 2)
+        #expect(summary.totalBytes == 3000)
+        #expect(summary.wouldRemove.first?.name == "stale-a")
+    }
+
+    /// Zero-skill prune is a valid dry-run (no archives).
+    @Test func pruneDryRunZeroSkills() {
+        let json = """
+        {"would_remove": [], "total_bytes": 0}
+        """
+        let summary = CuratorService.parsePruneDryRun(json)
+        #expect(summary.totalCount == 0)
+        #expect(summary.totalBytes == 0)
+        #expect(summary.totalBytesLabel == "—")
+    }
+
+    /// Bare-array fallback: some Hermes builds may print just the
+    /// would-remove list when the wrapper is missing.
+    @Test func pruneDryRunBareArrayFallback() {
+        let json = """
+        [{"name": "lonely", "size_bytes": 500}]
+        """
+        let summary = CuratorService.parsePruneDryRun(json)
+        #expect(summary.totalCount == 1)
+        #expect(summary.totalBytes == 500)
+    }
+
+    /// Empty / whitespace stdout → zero summary (no decoding throw).
+    @Test func pruneDryRunEmptyStaysSafe() {
+        let summary = CuratorService.parsePruneDryRun("   \n")
+        #expect(summary.totalCount == 0)
+        #expect(summary.totalBytes == 0)
+    }
+
+    /// Verify the size label uses the byte formatter (not raw bytes).
+    @Test func archivedSkillSizeLabelFormats() {
+        let big = HermesCuratorArchivedSkill(name: "x", sizeBytes: 1_500_000)
+        // ByteCountFormatter produces a localized label; just verify
+        // it's non-empty and not raw "1500000".
+        #expect(!big.sizeLabel.isEmpty)
+        #expect(big.sizeLabel != "1500000")
+    }
 }

scarf/Packages/ScarfCore/Tests/ScarfCoreTests/HermesGatewayListServiceTests.swift

@@ -1,131 +0,0 @@
-import Testing
-import Foundation
-@testable import ScarfCore
-
-/// Parser tests for `hermes gateway list --json`. Pure — no transport, no
-/// process calls.
-@Suite struct HermesGatewayListServiceTests {
-
-    private func data(_ s: String) -> Data { s.data(using: .utf8)! }
-
-    @Test func parsesSingleProfileSinglePlatform() {
-        let json = data(#"""
-        {"profiles":[{"name":"default","running":true,"pid":1234,
-        "platforms":["slack","telegram"]}]}
-        """#)
-        let snap = HermesGatewayListService.parse(json)
-        #expect(snap?.profiles.count == 1)
-        #expect(snap?.profiles[0].profile == "default")
-        #expect(snap?.profiles[0].pid == 1234)
-        #expect(snap?.profiles[0].isRunning == true)
-        #expect(snap?.profiles[0].platforms == ["slack", "telegram"])
-    }
-
-    @Test func parsesMultipleProfiles() {
-        let json = data(#"""
-        {"profiles":[
-            {"name":"work","running":true,"pid":2001,"platforms":["slack"]},
-            {"name":"personal","running":false,"platforms":["telegram"]}
-        ]}
-        """#)
-        let snap = HermesGatewayListService.parse(json)
-        #expect(snap?.profiles.count == 2)
-        #expect(snap?.profiles[0].profile == "work")
-        #expect(snap?.profiles[0].isRunning == true)
-        #expect(snap?.profiles[1].profile == "personal")
-        #expect(snap?.profiles[1].isRunning == false)
-        #expect(snap?.profiles[1].pid == nil)
-    }
-
-    @Test func parsesBareArrayShape() {
-        // Tolerance for a top-level array (no `profiles` wrapper).
-        let json = data(#"""
-        [{"name":"default","running":true,"pid":42,"platforms":["discord"]}]
-        """#)
-        let snap = HermesGatewayListService.parse(json)
-        #expect(snap?.profiles.count == 1)
-        #expect(snap?.profiles[0].profile == "default")
-    }
-
-    @Test func toleratesAlternateFieldNames() {
-        // `profile` instead of `name`, `state` instead of `running`,
-        // `connected_platforms` instead of `platforms` — defensive defaults
-        // keep the parser happy if Hermes ships any of these.
-        let json = data(#"""
-        {"profiles":[{"profile":"alt","state":"running","pid":7,
-        "connected_platforms":["matrix"]}]}
-        """#)
-        let snap = HermesGatewayListService.parse(json)
-        #expect(snap?.profiles[0].profile == "alt")
-        #expect(snap?.profiles[0].isRunning == true)
-        #expect(snap?.profiles[0].platforms == ["matrix"])
-    }
-
-    @Test func returnsNilOnEmptyData() {
-        #expect(HermesGatewayListService.parse(Data()) == nil)
-    }
-
-    @Test func returnsNilOnUnparseableJSON() {
-        let json = data("not-json")
-        #expect(HermesGatewayListService.parse(json) == nil)
-    }
-
-    @Test func returnsEmptySnapshotOnEmptyProfilesArray() {
-        let json = data(#"{"profiles":[]}"#)
-        let snap = HermesGatewayListService.parse(json)
-        #expect(snap?.profiles.isEmpty == true)
-    }
-
-    @Test func toleratesUnknownKeys() {
-        // Forward-compat: a future v0.13.x Hermes adds extra fields, parser
-        // still works.
-        let json = data(#"""
-        {"profiles":[{"name":"default","running":true,"platforms":["slack"],
-        "future_field":"value","another":42}]}
-        """#)
-        let snap = HermesGatewayListService.parse(json)
-        #expect(snap?.profiles[0].profile == "default")
-    }
-
-    // MARK: - headerDigest
-
-    @Test func headerDigestEmptyProfiles() {
-        let snap = GatewayListSnapshot(profiles: [])
-        #expect(snap.headerDigest == "no profiles configured")
-    }
-
-    @Test func headerDigestSingleProfileRunning() {
-        let snap = GatewayListSnapshot(profiles: [
-            .init(profile: "default", isRunning: true, pid: 100,
-                  platforms: ["slack", "telegram"])
-        ])
-        #expect(snap.headerDigest == "default profile · running · slack, telegram")
-    }
-
-    @Test func headerDigestSingleProfileStopped() {
-        let snap = GatewayListSnapshot(profiles: [
-            .init(profile: "default", isRunning: false, pid: nil, platforms: [])
-        ])
-        #expect(snap.headerDigest == "default profile · stopped")
-    }
-
-    @Test func headerDigestMultipleProfilesSomeRunning() {
-        let snap = GatewayListSnapshot(profiles: [
-            .init(profile: "work", isRunning: true, pid: 1, platforms: ["slack"]),
-            .init(profile: "home", isRunning: false, pid: nil, platforms: ["matrix"]),
-            .init(profile: "extra", isRunning: true, pid: 2, platforms: [])
-        ])
-        // 3 profiles total, 2 running, surface first running profile's
-        // platform list as the highlight.
-        #expect(snap.headerDigest == "3 profiles (2 running) · work: slack")
-    }
-
-    @Test func headerDigestMultipleProfilesNoneRunning() {
-        let snap = GatewayListSnapshot(profiles: [
-            .init(profile: "a", isRunning: false, pid: nil, platforms: ["slack"]),
-            .init(profile: "b", isRunning: false, pid: nil, platforms: ["matrix"])
-        ])
-        // No running profile — fall back to the first profile's platforms.
-        #expect(snap.headerDigest == "2 profiles (0 running) · a: slack")
-    }
-}

scarf/Packages/ScarfCore/Tests/ScarfCoreTests/M6ConfigCronTests.swift

@@ -228,87 +228,6 @@ import Foundation
         #expect(c.timezone == "America/New_York")
     }
 
-    // MARK: - v0.13 gateway.platforms.<platform> block
-
-    @Test func gatewayPlatformsEmptyByDefault() {
-        let c = HermesConfig(yaml: "")
-        #expect(c.gatewayPlatforms.isEmpty)
-    }
-
-    @Test func parsesGatewayAllowlistsForSlack() {
-        let yaml = """
-        gateway:
-          platforms:
-            slack:
-              allowed_channels:
-                - C01
-                - C02
-              busy_ack_enabled: false
-              gateway_restart_notification: true
-              slash_command_notice_ttl_seconds: 120
-        """
-        let cfg = HermesConfig(yaml: yaml)
-        let block = cfg.gatewayPlatforms["slack"]
-        #expect(block?.allowedChannels == ["C01", "C02"])
-        #expect(block?.busyAckEnabled == false)
-        #expect(block?.gatewayRestartNotification == true)
-        #expect(block?.slashCommandNoticeTTLSeconds == 120)
-    }
-
-    @Test func parsesGatewayAllowlistsForTelegramAndMatrix() {
-        let yaml = """
-        gateway:
-          platforms:
-            telegram:
-              allowed_chats:
-                - '@alice'
-                - '12345'
-            matrix:
-              allowed_rooms:
-                - '!room:matrix.org'
-        """
-        let cfg = HermesConfig(yaml: yaml)
-        #expect(cfg.gatewayPlatforms["telegram"]?.allowedChats == ["@alice", "12345"])
-        #expect(cfg.gatewayPlatforms["matrix"]?.allowedRooms == ["!room:matrix.org"])
-    }
-
-    @Test func gatewayBlockCoexistsWithLegacyPlatformBlocks() {
-        // Regression: legacy `platforms.slack.reply_to_mode` and
-        // `matrix.require_mention` must keep parsing when the new
-        // `gateway:` block is also present — no key collisions.
-        let yaml = """
-        platforms:
-          slack:
-            reply_to_mode: all
-        matrix:
-          require_mention: false
-        gateway:
-          platforms:
-            slack:
-              allowed_channels:
-                - C01
-        """
-        let cfg = HermesConfig(yaml: yaml)
-        #expect(cfg.slack.replyToMode == "all")
-        #expect(cfg.matrix.requireMention == false)
-        #expect(cfg.gatewayPlatforms["slack"]?.allowedChannels == ["C01"])
-    }
-
-    @Test func gatewayPlatformsSkipsPlatformsWithoutV013Keys() {
-        // The `gateway:` block exists but only Slack has a v0.13 key —
-        // platforms without keys must NOT appear in `gatewayPlatforms`.
-        let yaml = """
-        gateway:
-          platforms:
-            slack:
-              busy_ack_enabled: true
-        """
-        let cfg = HermesConfig(yaml: yaml)
-        #expect(cfg.gatewayPlatforms["slack"] != nil)
-        #expect(cfg.gatewayPlatforms["mattermost"] == nil)
-        #expect(cfg.gatewayPlatforms["telegram"] == nil)
-    }
-
     @Test func cronScheduleMemberwise() {
         let s = CronSchedule(
             kind: "cron",

scarf/Scarf iOS/Curator/CuratorView.swift

@@ -13,11 +13,24 @@ import ScarfDesign
 /// `HermesCapabilities.hasCurator` is true.
 struct CuratorView: View {
     @State private var viewModel: CuratorViewModel
+    @Environment(\.hermesCapabilities) private var capabilitiesStore
+
+    // TODO(WS-9): add a read-only "Archived" section mirroring the Mac
+    // surface (no per-row Restore/Prune mutations on iOS in this
+    // release). Gate on `capabilitiesStore?.capabilities.hasCuratorArchive`.
 
     init(context: ServerContext) {
         _viewModel = State(initialValue: CuratorViewModel(context: context))
     }
 
+    /// Whether the connected host runs curator synchronously. Threaded
+    /// into `runNow` so v0.13+ hosts block-with-spinner; pre-v0.13 fire
+    /// and forget. WS-9 will surface a richer iOS progress affordance
+    /// alongside the read-only Archived section.
+    private var archiveAvailable: Bool {
+        capabilitiesStore?.capabilities.hasCuratorArchive ?? false
+    }
+
     var body: some View {
         List {
             Section {
@@ -115,7 +128,7 @@ struct CuratorView: View {
     private var actionFooter: some View {
         HStack(spacing: 8) {
             Button {
-                Task { await viewModel.runNow() }
+                Task { await viewModel.runNow(synchronous: archiveAvailable, timeout: 600) }
             } label: {
                 Label("Run now", systemImage: "play.fill")
             }

scarf/scarf/Core/Services/HermesFileService.swift

@@ -254,47 +254,6 @@ struct HermesFileService: Sendable {
             cooldownSeconds: int("platforms.homeassistant.extra.cooldown_seconds", default: 30)
         )
 
-        // -- v0.13: per-platform Messaging Gateway settings --------------
-        // Mirrors the canonical extractor in
-        // `ScarfCore/Parsing/HermesConfig+YAML.swift`. Behaviour parity
-        // matters: both parsers must populate `gatewayPlatforms` the same
-        // way so iOS and Mac surfaces stay in lockstep.
-        // TODO(WS-5-Q2): YAML key path unverified — see the comment in the
-        // ScarfCore extractor for the resolution path.
-        let gatewayAllowlistPlatforms = [
-            "slack", "mattermost", "google-chat",
-            "telegram", "whatsapp",
-            "matrix", "dingtalk",
-        ]
-        var gatewayPlatforms: [String: GatewayPlatformSettings] = [:]
-        for platform in gatewayAllowlistPlatforms {
-            let prefix = "gateway.platforms.\(platform)."
-            let allowedChannels = lists[prefix + "allowed_channels"] ?? []
-            let allowedChats    = lists[prefix + "allowed_chats"]    ?? []
-            let allowedRooms    = lists[prefix + "allowed_rooms"]    ?? []
-            let busy            = bool(prefix + "busy_ack_enabled", default: true)
-            let restartNotice   = bool(prefix + "gateway_restart_notification",
-                                       default: false)
-            let ttl             = int(prefix + "slash_command_notice_ttl_seconds",
-                                      default: 0)
-            let isEmpty = allowedChannels.isEmpty
-                && allowedChats.isEmpty
-                && allowedRooms.isEmpty
-                && values[prefix + "busy_ack_enabled"] == nil
-                && values[prefix + "gateway_restart_notification"] == nil
-                && values[prefix + "slash_command_notice_ttl_seconds"] == nil
-            if !isEmpty {
-                gatewayPlatforms[platform] = GatewayPlatformSettings(
-                    allowedChannels: allowedChannels,
-                    allowedChats: allowedChats,
-                    allowedRooms: allowedRooms,
-                    busyAckEnabled: busy,
-                    gatewayRestartNotification: restartNotice,
-                    slashCommandNoticeTTLSeconds: ttl
-                )
-            }
-        }
-
         return HermesConfig(
             model: str("model.default", default: "unknown"),
             provider: str("model.provider", default: "unknown"),
@@ -354,8 +313,7 @@ struct HermesFileService: Sendable {
             homeAssistant: homeAssistant,
             cacheTTL: str("prompt_caching.cache_ttl", default: "5m"),
             redactionEnabled: bool("redaction.enabled", default: false),
-            runtimeMetadataFooter: bool("agent.runtime_metadata_footer", default: false),
+            runtimeMetadataFooter: bool("agent.runtime_metadata_footer", default: false)
-            gatewayPlatforms: gatewayPlatforms
         )
     }
 

scarf/scarf/Features/Curator/Views/CuratorArchivedSection.swift

@@ -0,0 +1,122 @@
+import SwiftUI
+import ScarfCore
+import ScarfDesign
+
+/// Mac sub-view rendered between the active-skill leaderboards and the
+/// last-report block on Hermes v0.13+ hosts. Lists everything currently
+/// archived (`hermes curator list-archived`) with per-row Restore + a
+/// bulk Prune affordance routed through the parent's confirm sheet.
+///
+/// Empty-state copy explains what archive means — useful when the
+/// curator hasn't run yet on a fresh install (no archives ≠ a problem).
+struct CuratorArchivedSection: View {
+    let archived: [HermesCuratorArchivedSkill]
+    let isLoading: Bool
+    let onRestore: (String) -> Void
+    let onPruneAll: () -> Void
+
+    var body: some View {
+        ScarfCard {
+            VStack(alignment: .leading, spacing: ScarfSpace.s2) {
+                header
+                if isLoading && archived.isEmpty {
+                    loadingRow
+                } else if archived.isEmpty {
+                    emptyState
+                } else {
+                    rows
+                }
+            }
+        }
+    }
+
+    private var header: some View {
+        HStack(alignment: .firstTextBaseline) {
+            ScarfSectionHeader("Archived")
+            Spacer()
+            Text("\(archived.count) skill\(archived.count == 1 ? "" : "s")")
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundMuted)
+            if !archived.isEmpty {
+                Button("Prune All…") {
+                    onPruneAll()
+                }
+                .buttonStyle(ScarfDestructiveButton())
+                .help("Remove every archived skill from disk. Cannot be undone.")
+            }
+        }
+    }
+
+    private var loadingRow: some View {
+        HStack(spacing: ScarfSpace.s2) {
+            ProgressView().controlSize(.small)
+            Text("Loading archived skills…")
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundMuted)
+            Spacer()
+        }
+    }
+
+    private var emptyState: some View {
+        VStack(alignment: .leading, spacing: ScarfSpace.s1) {
+            Text("No archived skills.")
+                .scarfStyle(.body)
+                .foregroundStyle(ScarfColor.foregroundMuted)
+            Text("The curator moves stale or redundant skills here on its weekly review. Until then, this list stays empty.")
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundFaint)
+        }
+    }
+
+    private var rows: some View {
+        VStack(alignment: .leading, spacing: ScarfSpace.s1) {
+            ForEach(archived) { skill in
+                ArchivedSkillRow(
+                    skill: skill,
+                    onRestore: { onRestore(skill.name) }
+                )
+            }
+        }
+    }
+}
+
+private struct ArchivedSkillRow: View {
+    let skill: HermesCuratorArchivedSkill
+    let onRestore: () -> Void
+
+    var body: some View {
+        HStack(alignment: .center, spacing: ScarfSpace.s2) {
+            Image(systemName: "archivebox.fill")
+                .font(.system(size: 12))
+                .foregroundStyle(ScarfColor.foregroundFaint)
+            VStack(alignment: .leading, spacing: 2) {
+                Text(skill.name)
+                    .scarfStyle(.body)
+                    .foregroundStyle(ScarfColor.foregroundPrimary)
+                    .lineLimit(1)
+                if let reason = skill.reason, !reason.isEmpty {
+                    Text(reason)
+                        .scarfStyle(.caption)
+                        .foregroundStyle(ScarfColor.foregroundMuted)
+                        .lineLimit(1)
+                }
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            Text(skill.archivedAtLabel)
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundFaint)
+                .frame(width: 96, alignment: .trailing)
+            Text(skill.sizeLabel)
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundFaint)
+                .frame(width: 72, alignment: .trailing)
+            Button("Restore") {
+                onRestore()
+            }
+            .buttonStyle(ScarfPrimaryButton())
+            .controlSize(.small)
+            .help("Restore \(skill.name) to the active skill set")
+        }
+        .padding(.vertical, 2)
+    }
+}

scarf/scarf/Features/Curator/Views/CuratorPruneConfirmSheet.swift

@@ -0,0 +1,123 @@
+import SwiftUI
+import ScarfCore
+import ScarfDesign
+
+/// Destructive-confirm sheet for `hermes curator prune` (bulk).
+///
+/// Pattern matches `TemplateUninstallSheet`: enumerate every entry that
+/// will be removed, surface the total count + bytes, and require an
+/// explicit click on a red `ScarfDestructiveButton` ("Prune
+/// permanently") before kicking off the destructive call. Cancel owns
+/// the keyboard default action so an accidental Enter-press doesn't
+/// nuke the archive.
+struct CuratorPruneConfirmSheet: View {
+    @Environment(\.dismiss) private var dismiss
+    let summary: CuratorPruneSummary
+    let isPruning: Bool
+    let onConfirm: () -> Void
+    let onCancel: () -> Void
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            header
+                .padding(.bottom, ScarfSpace.s2)
+            ScarfDivider()
+            ScrollView {
+                VStack(alignment: .leading, spacing: ScarfSpace.s2) {
+                    ForEach(summary.wouldRemove) { skill in
+                        row(skill: skill)
+                    }
+                    if summary.wouldRemove.isEmpty {
+                        Text("Nothing currently archived. Nothing to prune.")
+                            .scarfStyle(.caption)
+                            .foregroundStyle(ScarfColor.foregroundMuted)
+                            .padding(.vertical, ScarfSpace.s2)
+                    }
+                }
+                .padding(.vertical, ScarfSpace.s2)
+            }
+            ScarfDivider()
+            footer
+                .padding(.top, ScarfSpace.s2)
+        }
+        .frame(minWidth: 520, minHeight: 380)
+        .padding(ScarfSpace.s4)
+    }
+
+    private var header: some View {
+        VStack(alignment: .leading, spacing: ScarfSpace.s1) {
+            HStack(alignment: .firstTextBaseline) {
+                Text("Prune Archived Skills")
+                    .scarfStyle(.title2)
+                    .foregroundStyle(ScarfColor.foregroundPrimary)
+                Spacer()
+                if summary.totalCount > 0 {
+                    ScarfBadge("\(summary.totalCount)", kind: .danger)
+                }
+            }
+            Text("This permanently deletes every archived skill from disk. Restoring an archived skill is no longer possible after pruning.")
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundMuted)
+                .fixedSize(horizontal: false, vertical: true)
+            if summary.totalBytes > 0 {
+                Text("Total to remove: \(summary.totalBytesLabel)")
+                    .scarfStyle(.caption)
+                    .foregroundStyle(ScarfColor.foregroundFaint)
+            }
+        }
+    }
+
+    private func row(skill: HermesCuratorArchivedSkill) -> some View {
+        HStack(spacing: ScarfSpace.s2) {
+            Image(systemName: "minus.circle")
+                .foregroundStyle(ScarfColor.danger)
+                .font(.caption)
+            VStack(alignment: .leading, spacing: 2) {
+                Text(skill.name)
+                    .scarfStyle(.body)
+                    .foregroundStyle(ScarfColor.foregroundPrimary)
+                    .lineLimit(1)
+                if let reason = skill.reason, !reason.isEmpty {
+                    Text(reason)
+                        .scarfStyle(.caption)
+                        .foregroundStyle(ScarfColor.foregroundMuted)
+                        .lineLimit(1)
+                }
+            }
+            Spacer()
+            Text(skill.archivedAtLabel)
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundFaint)
+                .frame(width: 96, alignment: .trailing)
+            Text(skill.sizeLabel)
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundFaint)
+                .frame(width: 72, alignment: .trailing)
+        }
+    }
+
+    private var footer: some View {
+        HStack {
+            Button("Cancel") {
+                onCancel()
+                dismiss()
+            }
+            .buttonStyle(ScarfGhostButton())
+            // Cancel owns .defaultAction so accidental Enter-presses
+            // don't trigger the destructive button (template-uninstall
+            // pattern recommended in the WS-4 plan).
+            .keyboardShortcut(.defaultAction)
+            .disabled(isPruning)
+            Spacer()
+            if isPruning {
+                ProgressView().controlSize(.small)
+            }
+            Button("Prune permanently") {
+                onConfirm()
+            }
+            .buttonStyle(ScarfDestructiveButton())
+            .disabled(isPruning || summary.wouldRemove.isEmpty)
+            .accessibilityIdentifier("curatorPrune.confirm")
+        }
+    }
+}

scarf/scarf/Features/Curator/Views/CuratorRestoreSheet.swift

@@ -2,18 +2,16 @@ import SwiftUI
 import ScarfCore
 import ScarfDesign
 
-/// Modal that lists archived skills (state ≠ active) and exposes a
+/// Legacy v0.12 fallback for restoring an archived skill by typed
-/// one-click "Restore" action per row. v0.12 archives are recoverable —
+/// name. Hermes v0.12 didn't ship `curator list-archived`, so the only
-/// `hermes curator restore <name>` brings the skill back into
+/// way to restore was to remember the skill name and pass it through
-/// `~/.hermes/skills/<category>/<name>/` and re-marks it active.
+/// `hermes curator restore <name>`.
 ///
-/// The Curator's `status` text doesn't enumerate archived skills with
+/// **v0.13+ flow (preferred):** `CuratorArchivedSection` renders a
-/// names; we surface what's available (counts + pinned list) and rely
+/// per-skill list with a one-click Restore button per row — no typing
-/// on the user knowing the names. Hermes ergo does an interactive
+/// required. This sheet stays reachable from the overflow menu only on
-/// `--name` arg if missing — but Scarf prefers explicit selection so
+/// pre-v0.13 hosts (gated by `!hasCuratorArchive`). Don't delete this
-/// users don't have to remember names. For v2.6 we render a free-form
+/// file even after WS-4 ships; v0.12 hosts still depend on it.
-/// text field; once Hermes ships a `curator list-archived` (tracked
-/// upstream), swap to a pickable list.
 struct CuratorRestoreSheet: View {
     let viewModel: CuratorViewModel
 

scarf/scarf/Features/Curator/Views/CuratorView.swift

@@ -2,57 +2,52 @@ import SwiftUI
 import ScarfCore
 import ScarfDesign
 
-/// Mac UI for Hermes v0.12's autonomous skill curator.
+/// Mac UI for Hermes's autonomous skill curator (v0.12 base + v0.13
+/// archive/prune surface).
 ///
 /// Surfaces the running state (enabled / paused / disabled), last-run
-/// metadata, agent-created skill counts, and the most/least-active /
+/// metadata, agent-created skill counts, the most/least-active /
-/// least-recently-active leaderboards. Pin-and-restore actions hit
+/// least-recently-active leaderboards, and on v0.13+ hosts the new
-/// `hermes curator pin/unpin/restore` via CuratorViewModel.
+/// archived-skills section + per-row Archive button on each leaderboard
+/// entry. Pin / unpin / restore / archive / prune route through
+/// CuratorViewModel → CuratorService.
 ///
 /// Capability-gated upstream: AppCoordinator only wires the sidebar
-/// item when `HermesCapabilities.hasCurator` is true. This view assumes
+/// item when `HermesCapabilities.hasCurator` is true. Archive surfaces
-/// it's reachable on a v0.12+ host.
+/// gate independently on `hasCuratorArchive`; pre-v0.13 hosts see the
+/// v2.7.x layout unchanged (legacy `CuratorRestoreSheet` reachable from
+/// the overflow menu, no Archive section, fire-and-forget Run Now).
 struct CuratorView: View {
     @State private var viewModel: CuratorViewModel
     @State private var showRestoreSheet = false
 
+    @Environment(\.hermesCapabilities) private var capabilitiesStore
+
     init(context: ServerContext) {
         _viewModel = State(initialValue: CuratorViewModel(context: context))
     }
 
+    /// Single source of truth for "v0.13 archive surface visible". Read
+    /// once in `body` and threaded into sub-views. Defensive default to
+    /// `false` so previews / smoke tests behave like a pre-v0.13 host.
+    private var archiveAvailable: Bool {
+        capabilitiesStore?.capabilities.hasCuratorArchive ?? false
+    }
+
     var body: some View {
         ScrollView {
             VStack(alignment: .leading, spacing: ScarfSpace.s4) {
                 ScarfPageHeader(
                     "Curator",
-                    subtitle: "Autonomous skill maintenance — Hermes v0.12+"
+                    subtitle: archiveAvailable
+                        ? "Autonomous skill maintenance — archive, prune, restore"
+                        : "Autonomous skill maintenance — Hermes v0.12+"
                 ) {
-                    HStack(spacing: ScarfSpace.s2) {
+                    headerActions
-                        if viewModel.isLoading {
+                }
-                            ProgressView().controlSize(.small)
+
-                        }
+                if let errorMessage = viewModel.errorMessage {
-                        Button("Run Now") {
+                    errorBanner(errorMessage)
-                            Task { await viewModel.runNow() }
-                        }
-                        .buttonStyle(ScarfPrimaryButton())
-                        .disabled(viewModel.isLoading)
-                        Menu {
-                            switch viewModel.status.state {
-                            case .paused:
-                                Button("Resume") { Task { await viewModel.resume() } }
-                            case .enabled:
-                                Button("Pause") { Task { await viewModel.pause() } }
-                            default:
-                                EmptyView()
-                            }
-                            Button("Restore Archived…") {
-                                showRestoreSheet = true
-                            }
-                            .disabled(viewModel.status.archivedSkills == 0)
-                        } label: {
-                            Image(systemName: "ellipsis.circle")
-                        }
-                    }
                 }
 
                 if let toast = viewModel.transientMessage {
@@ -64,6 +59,19 @@ struct CuratorView: View {
                 pinnedSection
                 activityTables
 
+                if archiveAvailable {
+                    CuratorArchivedSection(
+                        archived: viewModel.archivedSkills,
+                        isLoading: viewModel.isLoadingArchive,
+                        onRestore: { name in
+                            Task { await viewModel.restore(name) }
+                        },
+                        onPruneAll: {
+                            Task { await viewModel.planPrune() }
+                        }
+                    )
+                }
+
                 if let report = viewModel.lastReportMarkdown {
                     lastReportSection(markdown: report)
                 }
@@ -71,10 +79,84 @@ struct CuratorView: View {
             .padding(ScarfSpace.s4)
         }
         .background(ScarfColor.backgroundPrimary)
-        .task { await viewModel.load() }
+        .task {
+            await viewModel.load()
+            if archiveAvailable {
+                await viewModel.loadArchive()
+            }
+        }
         .sheet(isPresented: $showRestoreSheet) {
             CuratorRestoreSheet(viewModel: viewModel)
         }
+        .sheet(
+            isPresented: Binding(
+                get: { viewModel.pruneSummary != nil },
+                set: { isShown in
+                    if !isShown { viewModel.cancelPrune() }
+                }
+            )
+        ) {
+            if let summary = viewModel.pruneSummary {
+                CuratorPruneConfirmSheet(
+                    summary: summary,
+                    isPruning: viewModel.isPruning,
+                    onConfirm: {
+                        Task { await viewModel.confirmPrune() }
+                    },
+                    onCancel: {
+                        viewModel.cancelPrune()
+                    }
+                )
+            }
+        }
+    }
+
+    @ViewBuilder
+    private var headerActions: some View {
+        HStack(spacing: ScarfSpace.s2) {
+            if viewModel.isLoading {
+                ProgressView().controlSize(.small)
+            }
+            Button("Run Now") {
+                Task {
+                    await viewModel.runNow(
+                        synchronous: archiveAvailable,
+                        timeout: 600
+                    )
+                }
+            }
+            .buttonStyle(ScarfPrimaryButton())
+            .disabled(viewModel.isLoading)
+            .help(archiveAvailable
+                ? "Curator runs synchronously on Hermes v0.13+. Usually 10–90s."
+                : "Trigger a curator run. Returns immediately on pre-v0.13 hosts.")
+
+            Menu {
+                switch viewModel.status.state {
+                case .paused:
+                    Button("Resume") { Task { await viewModel.resume() } }
+                case .enabled:
+                    Button("Pause") { Task { await viewModel.pause() } }
+                default:
+                    EmptyView()
+                }
+
+                if archiveAvailable {
+                    Divider()
+                    Button("Prune Archived…", role: .destructive) {
+                        Task { await viewModel.planPrune() }
+                    }
+                    .disabled(viewModel.archivedSkills.isEmpty && !viewModel.isLoadingArchive)
+                } else {
+                    Button("Restore Archived…") {
+                        showRestoreSheet = true
+                    }
+                    .disabled(viewModel.status.archivedSkills == 0)
+                }
+            } label: {
+                Image(systemName: "ellipsis.circle")
+            }
+        }
     }
 
     private var statusSummary: some View {
@@ -206,6 +288,10 @@ struct CuratorView: View {
                         }
                         .buttonStyle(.plain)
                         .help(viewModel.status.pinnedNames.contains(row.name) ? "Pinned" : "Pin skill")
+
+                        if archiveAvailable {
+                            archiveButton(for: row.name)
+                        }
                     }
                     .padding(.vertical, 2)
                 }
@@ -213,6 +299,25 @@ struct CuratorView: View {
         }
     }
 
+    @ViewBuilder
+    private func archiveButton(for name: String) -> some View {
+        if viewModel.pendingArchiveName == name {
+            ProgressView()
+                .controlSize(.small)
+                .frame(width: 14, height: 14)
+        } else {
+            Button {
+                Task { await viewModel.archive(name) }
+            } label: {
+                Image(systemName: "archivebox")
+                    .font(.system(size: 12))
+            }
+            .buttonStyle(.plain)
+            .help("Archive (move out of active set)")
+            .disabled(viewModel.pendingArchiveName != nil)
+        }
+    }
+
     private func counterChip(label: String, value: Int) -> some View {
         Text("\(label) \(value)")
             .font(ScarfFont.monoSmall)
@@ -277,6 +382,35 @@ struct CuratorView: View {
         .background(ScarfColor.accentTint)
         .clipShape(RoundedRectangle(cornerRadius: ScarfRadius.md))
     }
+
+    /// Inline yellow banner for CLI failures. Non-blocking — sits above
+    /// the status summary and dismisses with the "x" so users can keep
+    /// interacting with the leaderboard. Mirrors the pattern in
+    /// KanbanBoardView.
+    private func errorBanner(_ message: String) -> some View {
+        HStack(alignment: .top, spacing: ScarfSpace.s2) {
+            Image(systemName: "exclamationmark.triangle.fill")
+                .foregroundStyle(ScarfColor.warning)
+            Text(message)
+                .scarfStyle(.caption)
+                .foregroundStyle(ScarfColor.foregroundPrimary)
+                .frame(maxWidth: .infinity, alignment: .leading)
+            Button {
+                viewModel.dismissError()
+            } label: {
+                Image(systemName: "xmark.circle.fill")
+                    .foregroundStyle(ScarfColor.foregroundMuted)
+            }
+            .buttonStyle(.plain)
+            .help("Dismiss")
+        }
+        .padding(.horizontal, ScarfSpace.s3)
+        .padding(.vertical, ScarfSpace.s2)
+        .background(
+            RoundedRectangle(cornerRadius: ScarfRadius.md)
+                .fill(ScarfColor.warning.opacity(0.12))
+        )
+    }
 }
 
 /// Simple `FlowLayout` for the pinned-skill chips. Custom layout

scarf/scarf/Features/Gateway/ViewModels/GatewayViewModel.swift

@@ -1,13 +1,7 @@
 import Foundation
 import ScarfCore
 
-// **Local rename for v0.13 / WS-5.** The user-facing label is "Messaging
+struct GatewayInfo {
-// Gateway"; the type names mirror that. The `SidebarSection.gateway` enum
-// case + `gateway_state.json` / `gateway.log` paths intentionally stay
-// unchanged — those aren't user-facing strings, and renaming them would
-// churn unrelated callers without changing what users see.
-
-struct MessagingGatewayInfo {
     let pid: Int?
     let state: String
     let exitReason: String?
@@ -43,48 +37,32 @@ struct PendingPairing: Identifiable {
 }
 
 @Observable
-@MainActor
+final class GatewayViewModel {
-final class MessagingGatewayViewModel {
     let context: ServerContext
-    /// Capability snapshot at view-init time. Read for the v0.13 cross-
-    /// profile digest (`hasGatewayList`); other v0.13 surfaces live on
-    /// per-platform setup views. `.empty` is fine outside the per-server
-    /// `ContextBoundRoot` (Previews, smoke tests).
-    let capabilities: HermesCapabilities
 
-    init(context: ServerContext = .local, capabilities: HermesCapabilities = .empty) {
+    init(context: ServerContext = .local) {
         self.context = context
-        self.capabilities = capabilities
     }
 
-    var gateway = MessagingGatewayInfo(pid: nil, state: "unknown", exitReason: nil, startTime: nil, updatedAt: nil, platforms: [], isLoaded: false, isStale: false)
+    var gateway = GatewayInfo(pid: nil, state: "unknown", exitReason: nil, startTime: nil, updatedAt: nil, platforms: [], isLoaded: false, isStale: false)
     var approvedUsers: [PairedUser] = []
     var pendingPairings: [PendingPairing] = []
     var isLoading = false
     var actionMessage: String?
-    /// `hermes gateway list --json` snapshot. `nil` when the verb fails
-    /// (pre-v0.13 host or no profiles registered yet) — the digest row
-    /// hides itself in that case.
-    var gatewayList: GatewayListSnapshot?
 
     func load() {
         isLoading = true
         let ctx = context
-        let caps = capabilities
         Task.detached { [weak self] in
             // Two sync transport calls + two CLI invocations — substantial
             // remote latency. Detach the whole load and commit at the end.
             let status = Self.fetchGatewayStatus(context: ctx)
             let pairing = Self.fetchPairing(context: ctx)
-            let listSnap = caps.hasGatewayList
-                ? HermesGatewayListService.fetch(context: ctx)
-                : nil
             await MainActor.run { [weak self] in
                 guard let self else { return }
                 self.gateway = status
                 self.approvedUsers = pairing.approved
                 self.pendingPairings = pairing.pending
-                self.gatewayList = listSnap
                 self.isLoading = false
             }
         }
@@ -92,7 +70,7 @@ final class MessagingGatewayViewModel {
 
     /// Static form of the gateway-status walk so the detached load can call
     /// it without bouncing back to MainActor.
-    nonisolated private static func fetchGatewayStatus(context: ServerContext) -> MessagingGatewayInfo {
+    nonisolated private static func fetchGatewayStatus(context: ServerContext) -> GatewayInfo {
         let stateJSON = context.readData(context.paths.gatewayStateJSON)
         var pid: Int?
         var state = "unknown"
@@ -124,7 +102,7 @@ final class MessagingGatewayViewModel {
         let isLoaded = statusOutput.contains("service is loaded")
         let isStale = statusOutput.contains("stale")
 
-        return MessagingGatewayInfo(
+        return GatewayInfo(
             pid: pid, state: state, exitReason: exitReason,
             startTime: startTime, updatedAt: updatedAt,
             platforms: platforms, isLoaded: isLoaded, isStale: isStale

scarf/scarf/Features/Gateway/Views/GatewayView.swift

@@ -2,24 +2,12 @@ import SwiftUI
 import ScarfCore
 import ScarfDesign
 
-/// Messaging Gateway page. Routes outbound chat to Discord / Telegram /
-/// Slack / etc. — distinct from the v0.10 **Tool Gateway** (Nous Portal
-/// subscription routing for web search / image / TTS / browser), which
-/// lives under `Features/Health/`. The user-facing label here is always
-/// "Messaging Gateway"; the SwiftUI struct stays `GatewayView` because
-/// `ContentView` references it by name (rename-on-touch invariant —
-/// avoid churning unrelated callers).
 struct GatewayView: View {
-    @State private var viewModel: MessagingGatewayViewModel
+    @State private var viewModel: GatewayViewModel
     @Environment(HermesFileWatcher.self) private var fileWatcher
-    @Environment(\.hermesCapabilities) private var capabilitiesStore
 
     init(context: ServerContext) {
-        // Capabilities arrive via environment after init runs, so the VM
+        _viewModel = State(initialValue: GatewayViewModel(context: context))
-        // is constructed with `.empty` and refreshed on first appear via
-        // `attach(capabilities:)`. Same pattern as the per-platform setup
-        // views — see `MessagingGatewayViewModel.capabilities` doc comment.
-        _viewModel = State(initialValue: MessagingGatewayViewModel(context: context))
     }
 
 
@@ -27,15 +15,10 @@ struct GatewayView: View {
         VStack(spacing: 0) {
             ScarfPageHeader(
                 "Messaging Gateway",
-                subtitle: "Outbound channel bridge — Discord, Telegram, Slack, Google Chat, etc."
+                subtitle: "Outbound channel bridge — Discord, Telegram, Slack, etc."
             )
             ScrollView {
-                VStack(alignment: .leading, spacing: ScarfSpace.s4) {
+                VStack(alignment: .leading, spacing: 24) {
-                    if let snap = viewModel.gatewayList,
-                       viewModel.capabilities.hasGatewayList,
-                       !snap.profiles.isEmpty {
-                        crossProfileDigest(snap)
-                    }
                     serviceSection
                     platformsSection
                     pairingSection
@@ -46,58 +29,14 @@ struct GatewayView: View {
         }
         .background(ScarfColor.backgroundPrimary)
         .navigationTitle("Messaging Gateway")
-        .onAppear {
+        .onAppear { viewModel.load() }
-            attachCapabilitiesIfNeeded()
-            viewModel.load()
-        }
         .onChange(of: fileWatcher.lastChangeDate) { viewModel.load() }
     }
 
-    /// Re-create the VM with the resolved capabilities the first time the
-    /// store hands us non-empty data. Same shape as `KanbanBoardView`'s
-    /// `attach` helper.
-    private func attachCapabilitiesIfNeeded() {
-        guard let store = capabilitiesStore,
-              store.capabilities.detected,
-              !viewModel.capabilities.detected else { return }
-        viewModel = MessagingGatewayViewModel(
-            context: viewModel.context,
-            capabilities: store.capabilities
-        )
-    }
-
-    // MARK: - v0.13 cross-profile digest
-
-    /// One-line summary above the gateway controls when the host is on
-    /// v0.13+ and `hermes gateway list --json` returned at least one
-    /// profile. Doubly-guarded — `hasGatewayList` AND `profiles != []`
-    /// — so a v0.13 host with no registered profiles doesn't render
-    /// an empty pill.
-    private func crossProfileDigest(_ snap: GatewayListSnapshot) -> some View {
-        HStack(spacing: ScarfSpace.s2) {
-            Image(systemName: "dot.radiowaves.left.and.right")
-                .foregroundStyle(ScarfColor.accent)
-            Text(snap.headerDigest)
-                .scarfStyle(.captionStrong)
-                .foregroundStyle(ScarfColor.foregroundPrimary)
-            Spacer()
-        }
-        .padding(.horizontal, ScarfSpace.s3)
-        .padding(.vertical, ScarfSpace.s2)
-        .background(
-            RoundedRectangle(cornerRadius: ScarfRadius.md, style: .continuous)
-                .fill(ScarfColor.backgroundSecondary)
-        )
-        .overlay(
-            RoundedRectangle(cornerRadius: ScarfRadius.md, style: .continuous)
-                .strokeBorder(ScarfColor.border, lineWidth: 1)
-        )
-    }
-
     // MARK: - Service
 
     private var serviceSection: some View {
-        VStack(alignment: .leading, spacing: ScarfSpace.s3) {
+        VStack(alignment: .leading, spacing: 12) {
             HStack {
                 Text("Service")
                     .font(.headline)
@@ -107,20 +46,15 @@ struct GatewayView: View {
                         .font(.caption)
                         .foregroundStyle(.secondary)
                 }
-                HStack(spacing: ScarfSpace.s2) {
+                HStack(spacing: 8) {
                     Button("Start") { viewModel.startGateway() }
-                        .buttonStyle(ScarfPrimaryButton())
-                        .controlSize(.small)
                     Button("Stop") { viewModel.stopGateway() }
-                        .buttonStyle(ScarfSecondaryButton())
-                        .controlSize(.small)
                     Button("Restart") { viewModel.restartGateway() }
-                        .buttonStyle(ScarfSecondaryButton())
-                        .controlSize(.small)
                 }
+                .controlSize(.small)
             }
 
-            HStack(spacing: ScarfSpace.s3) {
+            HStack(spacing: 16) {
                 StatusBadge(
                     label: viewModel.gateway.state,
                     isActive: viewModel.gateway.state == "running"
@@ -163,7 +97,7 @@ struct GatewayView: View {
     // MARK: - Platforms
 
     private var platformsSection: some View {
-        VStack(alignment: .leading, spacing: ScarfSpace.s2) {
+        VStack(alignment: .leading, spacing: 8) {
             Text("Platforms")
                 .font(.headline)
             if viewModel.gateway.platforms.isEmpty {
@@ -171,7 +105,7 @@ struct GatewayView: View {
                     .font(.caption)
                     .foregroundStyle(.secondary)
             } else {
-                HStack(spacing: ScarfSpace.s3) {
+                HStack(spacing: 12) {
                     ForEach(viewModel.gateway.platforms) { platform in
                         VStack(spacing: 6) {
                             Image(systemName: platform.icon)
@@ -185,9 +119,9 @@ struct GatewayView: View {
                             )
                         }
                         .frame(maxWidth: .infinity)
-                        .padding(ScarfSpace.s3)
+                        .padding(12)
                         .background(.quaternary.opacity(0.5))
-                        .clipShape(RoundedRectangle(cornerRadius: ScarfRadius.md))
+                        .clipShape(RoundedRectangle(cornerRadius: 8))
                     }
                 }
             }
@@ -197,12 +131,12 @@ struct GatewayView: View {
     // MARK: - Pairing
 
     private var pairingSection: some View {
-        VStack(alignment: .leading, spacing: ScarfSpace.s3) {
+        VStack(alignment: .leading, spacing: 12) {
             Text("Paired Users")
                 .font(.headline)
 
             if !viewModel.pendingPairings.isEmpty {
-                VStack(alignment: .leading, spacing: ScarfSpace.s2) {
+                VStack(alignment: .leading, spacing: 8) {
                     Label("Pending Approvals", systemImage: "clock.badge.questionmark")
                         .font(.caption.bold())
                         .foregroundStyle(.orange)
@@ -216,12 +150,12 @@ struct GatewayView: View {
                                 viewModel.approvePairing(platform: pending.platform, code: pending.code)
                             }
                             .controlSize(.small)
-                            .buttonStyle(ScarfPrimaryButton())
+                            .buttonStyle(.borderedProminent)
                         }
                         .font(.caption)
-                        .padding(ScarfSpace.s2)
+                        .padding(8)
                         .background(.orange.opacity(0.1))
-                        .clipShape(RoundedRectangle(cornerRadius: ScarfRadius.sm))
+                        .clipShape(RoundedRectangle(cornerRadius: 6))
                     }
                 }
             }
@@ -248,9 +182,9 @@ struct GatewayView: View {
                         }
                         .controlSize(.small)
                     }
-                    .padding(ScarfSpace.s2)
+                    .padding(8)
                     .background(.quaternary.opacity(0.3))
-                    .clipShape(RoundedRectangle(cornerRadius: ScarfRadius.sm))
+                    .clipShape(RoundedRectangle(cornerRadius: 6))
                 }
             }
         }

scarf/scarf/Features/Platforms/ViewModels/PlatformSetup/GatewayBehaviorViewModel.swift

@@ -1,140 +0,0 @@
-import Foundation
-import ScarfCore
-import os
-
-/// View-model for the v0.13 Messaging Gateway behavior subsection composed
-/// into each per-platform setup view. Owns the four v0.13 controls
-/// (allowlist + three behavior toggles) so the existing per-platform VMs
-/// don't grow another set of fields.
-///
-/// Capability-gated. Pre-v0.13 hosts skip the entire subsection (the
-/// owning view returns `EmptyView` when none of the v0.13 flags is on),
-/// so this VM never has its `save()` called against a host that can't
-/// honor it.
-@Observable
-@MainActor
-final class GatewayBehaviorViewModel {
-    private static let logger = Logger(subsystem: "com.scarf", category: "GatewayBehavior")
-
-    let platform: String
-    let context: ServerContext
-    let capabilities: HermesCapabilities
-    /// Allowlist kind for this platform, or `nil` for platforms without
-    /// an allowlist surface (Discord, Signal, etc. — `GatewayBehaviorSection`
-    /// short-circuits before instantiating this VM in that case, but the
-    /// field is `nil` for safety).
-    let kind: GatewayAllowlistKind?
-
-    // Allowlist
-    var items: [String] = []
-
-    // Behavior toggles
-    var busyAckEnabled: Bool = true
-    var gatewayRestartNotification: Bool = false
-    var slashCommandNoticeTTLSeconds: Int = 0
-
-    var message: String?
-    var isSaving: Bool = false
-
-    init(
-        platform: String,
-        capabilities: HermesCapabilities,
-        context: ServerContext = .local
-    ) {
-        self.platform = platform
-        self.capabilities = capabilities
-        self.context = context
-        self.kind = GatewayAllowlistKind.kind(for: platform)
-    }
-
-    /// Hydrate from `~/.hermes/config.yaml`. Called from the section's
-    /// `.onAppear`. Empty when the platform has no `gateway:` block in
-    /// the file — defaults match v0.13 server-side defaults so the form
-    /// looks identical to a fresh-install host.
-    func load() {
-        let cfg = HermesFileService(context: context).loadConfig()
-        let block = cfg.gatewayPlatforms[platform] ?? .empty
-        if let kind {
-            switch kind {
-            case .channels: items = block.allowedChannels
-            case .chats:    items = block.allowedChats
-            case .rooms:    items = block.allowedRooms
-            }
-        } else {
-            items = []
-        }
-        busyAckEnabled              = block.busyAckEnabled
-        gatewayRestartNotification  = block.gatewayRestartNotification
-        slashCommandNoticeTTLSeconds = block.slashCommandNoticeTTLSeconds
-    }
-
-    /// Persist edits in two phases:
-    ///
-    /// 1. **Allowlist write** via `GatewayConfigWriter.saveList` — direct
-    ///    YAML edit, since `hermes config set` can't write list values.
-    ///    Skipped when the platform has no `kind` (no allowlist surface)
-    ///    or the host doesn't advertise `hasGatewayAllowlists`.
-    /// 2. **Scalar saves** via `PlatformSetupHelpers.saveForm` for the
-    ///    three v0.13 behavior toggles. Each gated on its own capability
-    ///    flag; the TTL field rides on the `hasGatewayBusyAckToggle ‖
-    ///    hasGatewayRestartNotification` proxy (see WS-5 plan §Open Questions
-    ///    Q5 + WS-1 Decision F).
-    func save() {
-        isSaving = true
-        defer {
-            isSaving = false
-            DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
-                self?.message = nil
-            }
-        }
-
-        // Step 1: list write via direct YAML edit. Detached so the SCP
-        // round-trip on remote hosts doesn't block MainActor — local
-        // writes are still cheap, but the same posture works for both.
-        if let kind, capabilities.hasGatewayAllowlists {
-            let trimmed = items
-                .map { $0.trimmingCharacters(in: .whitespaces) }
-                .filter { !$0.isEmpty }
-            let ok = GatewayConfigWriter.saveList(
-                context: context,
-                platform: platform,
-                key: kind.yamlKey,
-                items: trimmed
-            )
-            if !ok {
-                Self.logger.warning("GatewayConfigWriter.saveList failed for \(self.platform, privacy: .public)")
-                message = "Failed to write allowlist to config.yaml"
-                return
-            }
-        }
-
-        // Step 2: scalar saves via `hermes config set`.
-        var configKV: [String: String] = [:]
-        let prefix = "gateway.platforms.\(platform)."
-        if capabilities.hasGatewayBusyAckToggle {
-            configKV[prefix + "busy_ack_enabled"] =
-                PlatformSetupHelpers.envBool(busyAckEnabled)
-        }
-        if capabilities.hasGatewayRestartNotification {
-            configKV[prefix + "gateway_restart_notification"] =
-                PlatformSetupHelpers.envBool(gatewayRestartNotification)
-        }
-        // TTL field rides on either of the v0.13 toggles being available —
-        // proxy gating per WS-1 Decision F + WS-5 Q5. // TODO(WS-5-Q5)
-        if capabilities.hasGatewayBusyAckToggle
-            || capabilities.hasGatewayRestartNotification {
-            configKV[prefix + "slash_command_notice_ttl_seconds"] =
-                String(slashCommandNoticeTTLSeconds)
-        }
-
-        if configKV.isEmpty {
-            message = "Allowlist saved — restart gateway to apply"
-            return
-        }
-
-        let result = PlatformSetupHelpers.saveForm(
-            context: context, envPairs: [:], configKV: configKV
-        )
-        message = result
-    }
-}

scarf/scarf/Features/Platforms/Views/PlatformSetup/Components/AllowlistEditor.swift

@@ -1,103 +0,0 @@
-import SwiftUI
-import ScarfCore
-import ScarfDesign
-
-/// Reusable list-of-strings editor for v0.13 cross-platform allowlists.
-/// Shape: a vertical stack of rows, each with a delete glyph; an "Add row"
-/// button at the bottom appends an empty entry.
-///
-/// Stateless — binds to the parent VM's `items` array. The VM owns
-/// persistence and change tracking; this view is pure presentation.
-struct AllowlistEditor: View {
-    @Binding var items: [String]
-    let kind: GatewayAllowlistKind
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: ScarfSpace.s2) {
-            HStack {
-                Text("Allowed \(kind.pluralNoun)")
-                    .scarfStyle(.caption)
-                    .foregroundStyle(ScarfColor.foregroundMuted)
-                Spacer()
-                Text(itemsCountLabel)
-                    .scarfStyle(.caption)
-                    .foregroundStyle(ScarfColor.foregroundFaint)
-            }
-
-            if items.isEmpty {
-                Text("No restrictions — agent responds in any \(kind.noun).")
-                    .scarfStyle(.caption)
-                    .foregroundStyle(ScarfColor.foregroundFaint)
-                    .padding(.vertical, ScarfSpace.s2)
-            } else {
-                VStack(spacing: 4) {
-                    ForEach(Array(items.enumerated()), id: \.offset) { idx, _ in
-                        AllowlistRow(
-                            value: Binding(
-                                get: { items[safe: idx] ?? "" },
-                                set: { newValue in
-                                    guard idx < items.count else { return }
-                                    items[idx] = newValue
-                                }
-                            ),
-                            placeholder: kind.inputPlaceholder,
-                            onDelete: {
-                                guard idx < items.count else { return }
-                                items.remove(at: idx)
-                            }
-                        )
-                    }
-                }
-            }
-
-            HStack {
-                Button {
-                    items.append("")
-                } label: {
-                    Label("Add \(kind.noun)", systemImage: "plus.circle")
-                        .font(.caption)
-                }
-                .buttonStyle(.borderless)
-                Spacer()
-            }
-        }
-        .padding(.horizontal, ScarfSpace.s3)
-        .padding(.vertical, ScarfSpace.s2)
-    }
-
-    private var itemsCountLabel: String {
-        let nonEmpty = items.filter { !$0.trimmingCharacters(in: .whitespaces).isEmpty }.count
-        if nonEmpty == 0 { return "0 \(kind.pluralNoun)" }
-        if nonEmpty == 1 { return "1 \(kind.noun)" }
-        return "\(nonEmpty) \(kind.pluralNoun)"
-    }
-}
-
-private struct AllowlistRow: View {
-    @Binding var value: String
-    let placeholder: String
-    let onDelete: () -> Void
-
-    var body: some View {
-        HStack(spacing: ScarfSpace.s2) {
-            TextField(placeholder, text: $value)
-                .textFieldStyle(.roundedBorder)
-                .font(ScarfFont.monoSmall)
-            Button {
-                onDelete()
-            } label: {
-                Image(systemName: "minus.circle.fill")
-                    .foregroundStyle(ScarfColor.danger)
-            }
-            .buttonStyle(.plain)
-            .help("Remove")
-        }
-    }
-}
-
-private extension Array {
-    subscript(safe index: Int) -> Element? {
-        guard index >= 0, index < count else { return nil }
-        return self[index]
-    }
-}

scarf/scarf/Features/Platforms/Views/PlatformSetup/Components/GatewayBehaviorSection.swift

@@ -1,96 +0,0 @@
-import SwiftUI
-import ScarfCore
-import ScarfDesign
-
-/// v0.13 Messaging Gateway behavior subsection composed into each per-
-/// platform setup view (Slack, Mattermost, Telegram, WhatsApp, Matrix,
-/// Google Chat). Owns its own `@State` view-model so the existing per-
-/// platform VMs don't grow another set of fields.
-///
-/// **Capability gating.** Hides itself entirely on pre-v0.13 hosts
-/// (returns `EmptyView` when none of the three v0.13 flags is on). Each
-/// internal control gates on its own flag, so a host that gains, say,
-/// `hasGatewayAllowlists` but not `hasGatewayBusyAckToggle` still gets
-/// the allowlist editor with the toggles hidden.
-struct GatewayBehaviorSection: View {
-    let platform: String
-    let capabilities: HermesCapabilities
-    let context: ServerContext
-
-    @State private var viewModel: GatewayBehaviorViewModel
-
-    init(platform: String, capabilities: HermesCapabilities, context: ServerContext) {
-        self.platform = platform
-        self.capabilities = capabilities
-        self.context = context
-        _viewModel = State(initialValue: GatewayBehaviorViewModel(
-            platform: platform,
-            capabilities: capabilities,
-            context: context
-        ))
-    }
-
-    var body: some View {
-        // Pre-v0.13 host — hide the entire subsection so the existing
-        // platform forms look unchanged. Critical regression invariant
-        // per WS-5 plan §"How to test" #1.
-        if !capabilities.hasGatewayAllowlists
-            && !capabilities.hasGatewayBusyAckToggle
-            && !capabilities.hasGatewayRestartNotification {
-            EmptyView()
-        } else {
-            content
-        }
-    }
-
-    private var content: some View {
-        VStack(alignment: .leading, spacing: ScarfSpace.s3) {
-            SettingsSection(title: "Gateway behavior (v0.13+)", icon: "dot.radiowaves.left.and.right") {
-                if capabilities.hasGatewayAllowlists,
-                   let kind = viewModel.kind {
-                    AllowlistEditor(
-                        items: $viewModel.items,
-                        kind: kind
-                    )
-                }
-                if capabilities.hasGatewayBusyAckToggle {
-                    ToggleRow(
-                        label: "Send 'Agent is working…' ack",
-                        isOn: viewModel.busyAckEnabled
-                    ) { viewModel.busyAckEnabled = $0 }
-                }
-                if capabilities.hasGatewayRestartNotification {
-                    ToggleRow(
-                        label: "Post 'Gateway restarted' notice on boot",
-                        isOn: viewModel.gatewayRestartNotification
-                    ) { viewModel.gatewayRestartNotification = $0 }
-                }
-                // TTL field rides on either v0.13 toggle being available
-                // — proxy gating per WS-1 Decision F. // TODO(WS-5-Q5)
-                if capabilities.hasGatewayBusyAckToggle
-                    || capabilities.hasGatewayRestartNotification {
-                    StepperRow(
-                        label: "Auto-delete slash-command notices (s)",
-                        value: viewModel.slashCommandNoticeTTLSeconds,
-                        range: 0...3600,
-                        step: 5
-                    ) { viewModel.slashCommandNoticeTTLSeconds = $0 }
-                }
-            }
-
-            HStack {
-                if let msg = viewModel.message {
-                    Label(msg, systemImage: "checkmark.circle.fill")
-                        .font(.caption)
-                        .foregroundStyle(.green)
-                }
-                Spacer()
-                Button("Save behavior") { viewModel.save() }
-                    .buttonStyle(ScarfPrimaryButton())
-                    .controlSize(.small)
-                    .disabled(viewModel.isSaving)
-            }
-        }
-        .onAppear { viewModel.load() }
-    }
-}

scarf/scarf/Features/Platforms/Views/PlatformSetup/MatrixSetupView.swift

@@ -4,13 +4,7 @@ import ScarfDesign
 
 struct MatrixSetupView: View {
     @State private var viewModel: MatrixSetupViewModel
-    @Environment(\.hermesCapabilities) private var capabilitiesStore
+    init(context: ServerContext) { _viewModel = State(initialValue: MatrixSetupViewModel(context: context)) }
-    let context: ServerContext
-
-    init(context: ServerContext) {
-        self.context = context
-        _viewModel = State(initialValue: MatrixSetupViewModel(context: context))
-    }
 
 
     var body: some View {
@@ -51,13 +45,6 @@ struct MatrixSetupView: View {
             }
 
             saveBar
-
-            // v0.13 Messaging Gateway behavior — self-hides on pre-v0.13.
-            GatewayBehaviorSection(
-                platform: "matrix",
-                capabilities: capabilitiesStore?.capabilities ?? .empty,
-                context: context
-            )
         }
         .onAppear { viewModel.load() }
     }

scarf/scarf/Features/Platforms/Views/PlatformSetup/MattermostSetupView.swift

@@ -4,13 +4,7 @@ import ScarfDesign
 
 struct MattermostSetupView: View {
     @State private var viewModel: MattermostSetupViewModel
-    @Environment(\.hermesCapabilities) private var capabilitiesStore
+    init(context: ServerContext) { _viewModel = State(initialValue: MattermostSetupViewModel(context: context)) }
-    let context: ServerContext
-
-    init(context: ServerContext) {
-        self.context = context
-        _viewModel = State(initialValue: MattermostSetupViewModel(context: context))
-    }
 
 
     var body: some View {
@@ -34,13 +28,6 @@ struct MattermostSetupView: View {
             }
 
             saveBar
-
-            // v0.13 Messaging Gateway behavior — self-hides on pre-v0.13.
-            GatewayBehaviorSection(
-                platform: "mattermost",
-                capabilities: capabilitiesStore?.capabilities ?? .empty,
-                context: context
-            )
         }
         .onAppear { viewModel.load() }
     }

scarf/scarf/Features/Platforms/Views/PlatformSetup/SlackSetupView.swift

@@ -4,13 +4,7 @@ import ScarfDesign
 
 struct SlackSetupView: View {
     @State private var viewModel: SlackSetupViewModel
-    @Environment(\.hermesCapabilities) private var capabilitiesStore
+    init(context: ServerContext) { _viewModel = State(initialValue: SlackSetupViewModel(context: context)) }
-    let context: ServerContext
-
-    init(context: ServerContext) {
-        self.context = context
-        _viewModel = State(initialValue: SlackSetupViewModel(context: context))
-    }
 
 
     var body: some View {
@@ -36,13 +30,6 @@ struct SlackSetupView: View {
             }
 
             saveBar
-
-            // v0.13 Messaging Gateway behavior — self-hides on pre-v0.13.
-            GatewayBehaviorSection(
-                platform: "slack",
-                capabilities: capabilitiesStore?.capabilities ?? .empty,
-                context: context
-            )
         }
         .onAppear { viewModel.load() }
     }

scarf/scarf/Features/Platforms/Views/PlatformSetup/TelegramSetupView.swift

@@ -4,13 +4,7 @@ import ScarfDesign
 
 struct TelegramSetupView: View {
     @State private var viewModel: TelegramSetupViewModel
-    @Environment(\.hermesCapabilities) private var capabilitiesStore
+    init(context: ServerContext) { _viewModel = State(initialValue: TelegramSetupViewModel(context: context)) }
-    let context: ServerContext
-
-    init(context: ServerContext) {
-        self.context = context
-        _viewModel = State(initialValue: TelegramSetupViewModel(context: context))
-    }
 
 
     var body: some View {
@@ -35,13 +29,6 @@ struct TelegramSetupView: View {
             }
 
             saveBar
-
-            // v0.13 Messaging Gateway behavior — self-hides on pre-v0.13.
-            GatewayBehaviorSection(
-                platform: "telegram",
-                capabilities: capabilitiesStore?.capabilities ?? .empty,
-                context: context
-            )
         }
         .onAppear { viewModel.load() }
     }

scarf/scarf/Features/Platforms/Views/PlatformSetup/WhatsAppSetupView.swift

@@ -4,13 +4,7 @@ import ScarfDesign
 
 struct WhatsAppSetupView: View {
     @State private var viewModel: WhatsAppSetupViewModel
-    @Environment(\.hermesCapabilities) private var capabilitiesStore
+    init(context: ServerContext) { _viewModel = State(initialValue: WhatsAppSetupViewModel(context: context)) }
-    let context: ServerContext
-
-    init(context: ServerContext) {
-        self.context = context
-        _viewModel = State(initialValue: WhatsAppSetupViewModel(context: context))
-    }
 
 
     var body: some View {
@@ -35,14 +29,6 @@ struct WhatsAppSetupView: View {
             }
 
             saveBar
-
-            // v0.13 Messaging Gateway behavior — self-hides on pre-v0.13.
-            GatewayBehaviorSection(
-                platform: "whatsapp",
-                capabilities: capabilitiesStore?.capabilities ?? .empty,
-                context: context
-            )
-
             Divider()
             pairingSection
         }

scarf/scarf/Features/Platforms/Views/PlatformsView.swift

@@ -5,33 +5,6 @@ import ScarfDesign
 struct PlatformsView: View {
     @State private var viewModel: PlatformsViewModel
     @Environment(HermesFileWatcher.self) private var fileWatcher
-    @Environment(\.hermesCapabilities) private var capabilitiesStore
-
-    /// Capabilities resolved at view-eval time. Defaults to `.empty` outside
-    /// the per-server `ContextBoundRoot`. Used to filter `KnownPlatforms.all`
-    /// for v0.13-only entries (Google Chat) — see `visiblePlatforms` for
-    /// the deliberate asymmetry: pre-v0.12 hosts still see Yuanbao + Teams
-    /// unfiltered, by design.
-    private var capabilities: HermesCapabilities {
-        capabilitiesStore?.capabilities ?? .empty
-    }
-
-    /// Capability-filtered platform list. Today only **Google Chat** is
-    /// gated — Yuanbao and Microsoft Teams stay unfiltered to avoid
-    /// changing v0.12 host UX in a v0.13 work-stream (WS-5 plan §Q4).
-    /// If we later decide to gate the v0.12 platforms too, add their
-    /// flags here; the `default: true` arm keeps every other platform
-    /// visible.
-    private var visiblePlatforms: [HermesToolPlatform] {
-        KnownPlatforms.all.filter { p in
-            switch p.name {
-            case "google-chat", "googlechat":
-                return capabilities.hasGoogleChatPlatform
-            default:
-                return true
-            }
-        }
-    }
 
     init(context: ServerContext) {
         _viewModel = State(initialValue: PlatformsViewModel(context: context))
@@ -67,12 +40,12 @@ struct PlatformsView: View {
             List(selection: Binding(
                 get: { viewModel.selected.name },
                 set: { name in
-                    if let p = visiblePlatforms.first(where: { $0.name == name }) {
+                    if let p = viewModel.platforms.first(where: { $0.name == name }) {
                         viewModel.selected = p
                     }
                 }
             )) {
-                ForEach(visiblePlatforms) { platform in
+                ForEach(viewModel.platforms) { platform in
                     HStack(spacing: 8) {
                         Image(systemName: KnownPlatforms.icon(for: platform.name))
                             .frame(width: 20)
@@ -176,7 +149,6 @@ struct PlatformsView: View {
         case "webhook":        WebhookSetupView(context: ctx)
         case "yuanbao":        yuanbaoPanel
         case "microsoft-teams": microsoftTeamsPanel
-        case "google-chat", "googlechat": googleChatPanel
         default:
             SettingsSection(title: LocalizedStringKey(viewModel.selected.displayName), icon: KnownPlatforms.icon(for: viewModel.selected.name)) {
                 ReadOnlyRow(label: "Setup", value: "No setup form for this platform yet.")
@@ -208,27 +180,6 @@ struct PlatformsView: View {
         }
     }
 
-    /// Hermes v0.13 — Google Chat is the 20th gateway platform. Like
-    /// Yuanbao + Microsoft Teams, the auth dance is OAuth-style and
-    /// lives outside Scarf, so the panel surfaces the setup verb rather
-    /// than a per-field form. The `GatewayBehaviorSection` below it picks
-    /// up the v0.13 allowlist + behavior toggles, capability-gated.
-    @ViewBuilder
-    private var googleChatPanel: some View {
-        VStack(alignment: .leading, spacing: ScarfSpace.s3) {
-            SettingsSection(title: "Google Chat", icon: KnownPlatforms.icon(for: "google-chat")) {
-                ReadOnlyRow(label: "Type", value: "Generic env-driven gateway adapter (v0.13+)")
-                ReadOnlyRow(label: "Setup", value: "Run `hermes setup` and select Google Chat to walk the OAuth flow.")
-                ReadOnlyRow(label: "Configured", value: viewModel.hasConfigBlock(for: viewModel.selected) ? "Yes" : "No")
-            }
-            GatewayBehaviorSection(
-                platform: "google-chat",
-                capabilities: capabilities,
-                context: viewModel.context
-            )
-        }
-    }
-
     private var cliPanel: some View {
         SettingsSection(title: "CLI", icon: "terminal") {
             ReadOnlyRow(label: "Scope", value: "Local terminal sessions")

scarf/scarf/Features/Skills/Views/SkillsView.swift

@@ -307,16 +307,6 @@ struct SkillsView: View {
                        case .missing(let hint) = designMdNpxStatus {
                         designMdNpxBanner(hint: hint)
                     }
-                    // v0.13 `[[as_document]]` directive — informational
-                    // only. Rendered when the skill body contains the
-                    // marker AND the host advertises Google Chat support
-                    // (cheap proxy: the directive shipped in v0.13
-                    // alongside Google Chat — see WS-5 plan §Q5/Q6).
-                    if (capabilitiesStore?.capabilities.hasGoogleChatPlatform ?? false),
-                       skillContentMentionsAsDocument {
-                        asDocumentInfoRow
-                    }
-
                     // v2.5 SKILL.md frontmatter chips. Render only the
                     // sections that are populated — old skills without
                     // this metadata show no extra rows.
@@ -412,39 +402,6 @@ struct SkillsView: View {
         }
     }
 
-    /// Returns true when the loaded skill body contains the v0.13
-    /// `[[as_document]]` directive. Substring scan over `skillContent`
-    /// — `[[as_document]]` is a literal token Hermes pattern-matches at
-    /// runtime, not a frontmatter key, so the body is the right place
-    /// to look. // TODO(WS-5-Q6): if Hermes ever moves the directive
-    /// into frontmatter, switch to `SkillFrontmatterParser` instead.
-    private var skillContentMentionsAsDocument: Bool {
-        viewModel.skillContent.contains("[[as_document]]")
-    }
-
-    /// Compact informational row about the `[[as_document]]` directive.
-    /// Does not block any action — it's a label so users understand why
-    /// images in the skill might land as document attachments on certain
-    /// platforms (Google Chat, Microsoft Teams) rather than inline.
-    private var asDocumentInfoRow: some View {
-        HStack(alignment: .top, spacing: 8) {
-            Image(systemName: "doc.badge.gearshape")
-                .foregroundStyle(.blue)
-            VStack(alignment: .leading, spacing: 2) {
-                Text("Document-attachment directive present (v0.13+)")
-                    .font(.caption.bold())
-                Text("Media in this skill marked with `[[as_document]]` is sent as document attachments instead of inline images on platforms that distinguish (Google Chat, Microsoft Teams).")
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-                    .fixedSize(horizontal: false, vertical: true)
-            }
-        }
-        .padding(10)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(.blue.opacity(0.08))
-        .clipShape(RoundedRectangle(cornerRadius: 8))
-    }
-
     /// Yellow banner surfaced on the design-md skill detail when the
     /// host's `npx` probe came back missing. Reuses the same color
     /// language as the missing-config banner.