Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions DESIGN.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ These are decorative — never use them to communicate status.
| Jared | `bubble.left.fill` | `systemGreen` |
| Full disk access | `internaldrive.fill` | `systemBlue` |
| REST API | `network` | `systemIndigo` |
| LLM | `brain` | `systemTeal` |
| Webhooks | `bolt.horizontal.fill` | `systemPink` |
| Contacts | `person.fill` | `systemOrange` |
| Messages automation | `envelope.fill` | `systemPurple` |
Expand All @@ -80,13 +79,12 @@ All text uses the system font via `NSFont.systemFont(ofSize:weight:)`.
| --- | --- | --- | --- |
| App title | 18 | `.semibold` | "Jared" in header. `ViewController.swift:111` |
| Section header | 10 | `.semibold`, uppercased, `tertiaryLabelColor` | "STATUS", "SERVICES". `ViewController.swift:256` |
| Row title | 13 | `.medium` | "REST API", "LLM". `ViewController.swift:563` |
| Row title | 13 | `.medium` | "REST API", "Webhooks". `ViewController.swift:563` |
| Row status / header subtitle / tool button | 12 | `.regular` (or `.medium` for the header CTA) | "Running", "Authorized". `ViewController.swift:114`, `:119`, `:280`, `:568` |
| Row action button | 11 | `.regular` | "Enable", "Manage". `ViewController.swift:574` |

Sheet/secondary screens (e.g. `LLMSettingsViewController`) reuse the 12pt
regular and 11pt button conventions. A new screen should pick from this scale —
don't introduce a new size.
Sheet/secondary screens reuse the 12pt regular and 11pt button conventions.
A new screen should pick from this scale — don't introduce a new size.

## Spacing & layout

Expand Down
7 changes: 0 additions & 7 deletions Documentation/config-sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,5 @@
"enabled": false,
"provider": "cloudflared"
}
},
"llm": {
"provider": "openai",
"apiKey": "sk-...",
"model": "gpt-4o",
"systemPrompt": "You are a helpful assistant.",
"rateLimitSeconds": 10.0
}
}
50 changes: 0 additions & 50 deletions Documentation/llm.md

This file was deleted.

1 change: 0 additions & 1 deletion Documentation/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ Welcome to the Jared documentation hub. Here you'll find a glossary of Jared's A
+ [Sample Plugin](SampleModule)
+ [Webhooks](webhooks.md)
+ [n8n Integration](n8n.md)
+ [LLM Integration](llm.md)
+ [REST API](restapi.md)
+ [Research: Retiring legacy concepts](research/retiring-legacy-concepts.md)
20 changes: 0 additions & 20 deletions Jared.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
B33278811CB2CB1300BBDD3A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B332787F1CB2CB1300BBDD3A /* Main.storyboard */; };
B3327DC42206607B009DD882 /* ContactHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3327DC32206607B009DD882 /* ContactHelper.swift */; };
B3327DC622066427009DD882 /* WebHookManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3327DC522066427009DD882 /* WebHookManager.swift */; };
EC000001000000000000AA01 /* LLMConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AA00 /* LLMConfiguration.swift */; };
EC000001000000000000AA03 /* LLMModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AA02 /* LLMModule.swift */; };
EC000001000000000000AA05 /* LLMModuleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AA04 /* LLMModuleTests.swift */; };
EC000001000000000000AA06 /* LLMConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AA00 /* LLMConfiguration.swift */; };
EC000001000000000000AA07 /* LLMModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AA02 /* LLMModule.swift */; };
EC000001000000000000AA40 /* ScheduleModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AA43 /* ScheduleModule.swift */; };
EC000001000000000000AA41 /* ScheduleModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AA43 /* ScheduleModule.swift */; };
EC000001000000000000AA44 /* ScheduleModuleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AA45 /* ScheduleModuleTests.swift */; };
Expand Down Expand Up @@ -76,7 +71,6 @@
B369509524DF224D0027CB1E /* SendImageSingleBuddy.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B37E82801FA85B170069E15D /* SendImageSingleBuddy.scpt */; };
B36C8D7F24EA655900C00A99 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B36C8D7E24EA655900C00A99 /* Configuration.swift */; };
B375A65921EB14470073F09F /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B375A65821EB14470073F09F /* AboutViewController.swift */; };
EC000001000000000000AC01 /* LLMSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AC02 /* LLMSettingsViewController.swift */; };
EC000001000000000000AC03 /* WebhookManagementWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AC04 /* WebhookManagementWindowController.swift */; };
EC000001000000000000AC05 /* TunnelManagementWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC000001000000000000AC06 /* TunnelManagementWindowController.swift */; };
B37E82821FA85B210069E15D /* SendTextSingleBuddy.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B37E82811FA85B210069E15D /* SendTextSingleBuddy.scpt */; };
Expand Down Expand Up @@ -205,9 +199,6 @@
B33278821CB2CB1300BBDD3A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B3327DC32206607B009DD882 /* ContactHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactHelper.swift; sourceTree = "<group>"; };
B3327DC522066427009DD882 /* WebHookManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebHookManager.swift; sourceTree = "<group>"; };
EC000001000000000000AA00 /* LLMConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LLMConfiguration.swift; sourceTree = "<group>"; };
EC000001000000000000AA02 /* LLMModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LLMModule.swift; sourceTree = "<group>"; };
EC000001000000000000AA04 /* LLMModuleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LLMModuleTests.swift; sourceTree = "<group>"; };
EC000001000000000000AA43 /* ScheduleModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleModule.swift; sourceTree = "<group>"; };
EC000001000000000000AA45 /* ScheduleModuleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleModuleTests.swift; sourceTree = "<group>"; };
EC000001000000000000AA53 /* MessageSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageSource.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -236,7 +227,6 @@
B369509124DE91760027CB1E /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
B36C8D7E24EA655900C00A99 /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
B375A65821EB14470073F09F /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
EC000001000000000000AC02 /* LLMSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LLMSettingsViewController.swift; sourceTree = "<group>"; };
EC000001000000000000AC04 /* WebhookManagementWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebhookManagementWindowController.swift; sourceTree = "<group>"; };
EC000001000000000000AC06 /* TunnelManagementWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelManagementWindowController.swift; sourceTree = "<group>"; };
B3774D4E2424AFEB00F02F62 /* JaredDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = JaredDebug.entitlements; sourceTree = "<group>"; };
Expand Down Expand Up @@ -366,7 +356,6 @@
EC000001000000000000AA0C /* MenuBarManager.swift */,
EC000001000000000000AD02 /* SystemSleepPreventer.swift */,
B375A65821EB14470073F09F /* AboutViewController.swift */,
EC000001000000000000AC02 /* LLMSettingsViewController.swift */,
EC000001000000000000AC04 /* WebhookManagementWindowController.swift */,
EC000001000000000000AC06 /* TunnelManagementWindowController.swift */,
B36563EE1F3D68980064B114 /* TouchBarTextFieldExtension.swift */,
Expand All @@ -383,7 +372,6 @@
children = (
B3327DC722068147009DD882 /* WebhookTests.swift */,
FA7B3C91D05E4A8B67120456 /* WebhookDeliveryTests.swift */,
EC000001000000000000AA04 /* LLMModuleTests.swift */,
EC000001000000000000AA11 /* ConfigurationWatcherTests.swift */,
EC000001000000000000AA45 /* ScheduleModuleTests.swift */,
EC000001000000000000AA24 /* MessageMatcherTests.swift */,
Expand Down Expand Up @@ -471,8 +459,6 @@
B3BF17C1244EBE9A00CC44C5 /* Router.swift */,
B39A65DF1CC1FB1B003E26B0 /* PluginManager.swift */,
B3327DC522066427009DD882 /* WebHookManager.swift */,
EC000001000000000000AA00 /* LLMConfiguration.swift */,
EC000001000000000000AA02 /* LLMModule.swift */,
EC000001000000000000AA43 /* ScheduleModule.swift */,
EC000001000000000000AA53 /* MessageSource.swift */,
EC000001000000000000AA57 /* InMemoryMessageSource.swift */,
Expand Down Expand Up @@ -791,8 +777,6 @@
B3327DC42206607B009DD882 /* ContactHelper.swift in Sources */,
B332787C1CB2CB1300BBDD3A /* ViewController.swift in Sources */,
B3327DC622066427009DD882 /* WebHookManager.swift in Sources */,
EC000001000000000000AA01 /* LLMConfiguration.swift in Sources */,
EC000001000000000000AA03 /* LLMModule.swift in Sources */,
EC000001000000000000AA40 /* ScheduleModule.swift in Sources */,
EC000001000000000000AA50 /* MessageSource.swift in Sources */,
EC000001000000000000AA54 /* InMemoryMessageSource.swift in Sources */,
Expand All @@ -807,7 +791,6 @@
B3BF17C4244EBF4900CC44C5 /* InternalModule.swift in Sources */,
B3BF17C2244EBE9A00CC44C5 /* Router.swift in Sources */,
B375A65921EB14470073F09F /* AboutViewController.swift in Sources */,
EC000001000000000000AC01 /* LLMSettingsViewController.swift in Sources */,
EC000001000000000000AC03 /* WebhookManagementWindowController.swift in Sources */,
EC000001000000000000AC05 /* TunnelManagementWindowController.swift in Sources */,
7F0E931D1D02FC250096BABE /* Global.swift in Sources */,
Expand All @@ -834,8 +817,6 @@
B3B844CC24DA671E00DC162A /* DiskAccessDelegate.swift in Sources */,
B319235724DD311B001904BA /* InternalModuleTest.swift in Sources */,
B38BB6AF24EBB4D8000700F7 /* Configuration.swift in Sources */,
EC000001000000000000AA06 /* LLMConfiguration.swift in Sources */,
EC000001000000000000AA07 /* LLMModule.swift in Sources */,
EC000001000000000000AA41 /* ScheduleModule.swift in Sources */,
EC000001000000000000AA51 /* MessageSource.swift in Sources */,
EC000001000000000000AA55 /* InMemoryMessageSource.swift in Sources */,
Expand Down Expand Up @@ -863,7 +844,6 @@
B3B844BA24D77A4900DC162A /* SendStyleTest.swift in Sources */,
B3327DD8220682ED009DD882 /* WebhookTests.swift in Sources */,
FA7B3C91D05E4A8B67120457 /* WebhookDeliveryTests.swift in Sources */,
EC000001000000000000AA05 /* LLMModuleTests.swift in Sources */,
EC000001000000000000AA09 /* ConfigurationWatcherTests.swift in Sources */,
EC000001000000000000AA21 /* MessageMatcherTests.swift in Sources */,
EC000001000000000000AA44 /* ScheduleModuleTests.swift in Sources */,
Expand Down
8 changes: 2 additions & 6 deletions Jared/Configuration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,24 @@ struct ConfigurationFile: Decodable {
let routes: [String: RouteConfiguration]
let webhooks: [RichWebhook]
let webServer: WebserverConfiguration
let llm: LLMConfiguration?

init(routes: [String: RouteConfiguration] = [:],
webhooks: [RichWebhook] = [],
webServer: WebserverConfiguration = WebserverConfiguration(port: 3000),
llm: LLMConfiguration? = nil) {
webServer: WebserverConfiguration = WebserverConfiguration(port: 3000)) {
self.routes = routes
self.webhooks = webhooks
self.webServer = webServer
self.llm = llm
}

init(from decoder: Decoder) throws {
let c = try decoder.container(keyedBy: CodingKeys.self)
routes = (try? c.decodeIfPresent([String: RouteConfiguration].self, forKey: .routes)) ?? [:]
webhooks = (try? c.decodeIfPresent([RichWebhook].self, forKey: .webhooks)) ?? []
webServer = (try? c.decodeIfPresent(WebserverConfiguration.self, forKey: .webServer)) ?? WebserverConfiguration(port: 3000)
llm = try? c.decodeIfPresent(LLMConfiguration.self, forKey: .llm)
}

private enum CodingKeys: String, CodingKey {
case routes, webhooks, webServer, llm
case routes, webhooks, webServer
}
}

Expand Down
1 change: 0 additions & 1 deletion Jared/JaredConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import Foundation

struct JaredConstants {
static let restApiIsDisabled = "RestApiIsDisabled"
static let llmIsDisabled = "LLMIsDisabled"
static let jaredIsDisabled = "JaredIsDisabled"
static let contactsAccess = "ContactsAccess"
static let sendMessageAccess = "SendMessageAccess"
Expand Down
26 changes: 0 additions & 26 deletions Jared/LLMConfiguration.swift

This file was deleted.

Loading