Merge pull request #23 from greggroth/copilot-cli

Add built-in support for GitHub Copilot CLI agent

Author: nicosuave

macos/Sources/Features/Terminal/TerminalController.swift

@@ -1961,6 +1961,8 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             base.command = "codex resume \(session.id)"
         case .opencode:
             base.command = "opencode --session \(session.id)"
+        case .copilotCli:
+            base.command = "copilot --resume \(session.id)"
         }
 
         if WorktrunkPreferences.worktreeTabsEnabled {

macos/Sources/Features/Worktrunk/AgentStatus/AgentHookInstaller.swift

@@ -51,6 +51,12 @@ enum AgentHookInstaller {
             marker: wrapperMarker,
             content: buildCodexWrapper()
         )
+        ensureFile(
+            url: AgentStatusPaths.copilotCliWrapperPath,
+            mode: 0o755,
+            marker: wrapperMarker,
+            content: buildCopilotCliWrapper()
+        )
 
         ensureFile(
             url: AgentStatusPaths.opencodeGlobalPluginPath,
@@ -295,6 +301,61 @@ enum AgentHookInstaller {
         """
     }
 
+    private static func buildCopilotCliWrapper() -> String {
+        let binDir = AgentStatusPaths.binDir.path
+        let eventsDir = AgentStatusPaths.eventsCacheDir.path
+        return """
+        #!/bin/bash
+        \(wrapperMarker)
+        # Wrapper for Copilot CLI: emits Start/Stop lifecycle events.
+
+        \(pathAugmentSnippet())
+
+        find_real_binary() {
+          local name="$1"
+          local IFS=:
+          for dir in $PATH; do
+            [ -z "$dir" ] && continue
+            dir="${dir%/}"
+            if [ "$dir" = "\(binDir)" ]; then
+              continue
+            fi
+            if [ -x "$dir/$name" ] && [ ! -d "$dir/$name" ]; then
+              printf "%s\\n" "$dir/$name"
+              return 0
+            fi
+          done
+          return 1
+        }
+
+        REAL_BIN="$(find_real_binary "copilot")"
+        if [ -z "$REAL_BIN" ]; then
+          echo "Ghostree: copilot not found in PATH. Install it and ensure it is on PATH, then retry." >&2
+          exit 127
+        fi
+
+        _EVENTS_DIR="${GHOSTREE_AGENT_EVENTS_DIR:-\(eventsDir)}"
+
+        # Emit synthetic Start event
+        printf '{\"timestamp\":\"%s\",\"eventType\":\"Start\",\"cwd\":\"%s\"}\\n' \\
+          "$(date -u +%Y-%m-%dT%H:%M:%S.000Z)" \\
+          "$(pwd -P 2>/dev/null || pwd)" \\
+          >> "$_EVENTS_DIR/agent-events.jsonl" 2>/dev/null
+
+        # Run copilot and capture exit code
+        "$REAL_BIN" "$@"
+        _EXIT=$?
+
+        # Emit synthetic Stop event
+        printf '{\"timestamp\":\"%s\",\"eventType\":\"Stop\",\"cwd\":\"%s\"}\\n' \\
+          "$(date -u +%Y-%m-%dT%H:%M:%S.000Z)" \\
+          "$(pwd -P 2>/dev/null || pwd)" \\
+          >> "$_EVENTS_DIR/agent-events.jsonl" 2>/dev/null
+
+        exit $_EXIT
+        """
+    }
+
     private static func buildOpenCodePlugin() -> String {
         let marker = AgentStatusPaths.opencodePluginMarker
         return """

macos/Sources/Features/Worktrunk/AgentStatus/AgentStatusPaths.swift

@@ -46,6 +46,10 @@ enum AgentStatusPaths {
         binDir.appendingPathComponent("codex")
     }
 
+    static var copilotCliWrapperPath: URL {
+        binDir.appendingPathComponent("copilot")
+    }
+
     static var opencodePluginMarker: String { "// Ghostree opencode plugin v5" }
 
     /** @see https://opencode.ai/docs/plugins */

macos/Sources/Features/Worktrunk/WorktrunkPreferences.swift

@@ -5,6 +5,7 @@ enum WorktrunkAgent: String, CaseIterable, Identifiable {
     case claude
     case codex
     case opencode
+    case copilotCli
 
     var id: String { rawValue }
 
@@ -13,6 +14,7 @@ enum WorktrunkAgent: String, CaseIterable, Identifiable {
         case .claude: return "Claude Code"
         case .codex: return "Codex"
         case .opencode: return "OpenCode"
+        case .copilotCli: return "Copilot"
         }
     }
 
@@ -21,6 +23,7 @@ enum WorktrunkAgent: String, CaseIterable, Identifiable {
         case .claude: return "claude"
         case .codex: return "codex"
         case .opencode: return "opencode"
+        case .copilotCli: return "copilot"
         }
     }
 
@@ -76,6 +79,7 @@ enum WorktrunkDefaultAction: String, CaseIterable, Identifiable {
     case claude
     case codex
     case opencode
+    case copilotCli
 
     var id: String { rawValue }
 
@@ -85,6 +89,7 @@ enum WorktrunkDefaultAction: String, CaseIterable, Identifiable {
         case .claude: return "Claude Code"
         case .codex: return "Codex"
         case .opencode: return "OpenCode"
+        case .copilotCli: return "Copilot"
         }
     }
 
@@ -94,6 +99,7 @@ enum WorktrunkDefaultAction: String, CaseIterable, Identifiable {
         case .claude: return .claude
         case .codex: return .codex
         case .opencode: return .opencode
+        case .copilotCli: return .copilotCli
         }
     }