Skip to content

Implement TERM_SESSION_ID and Apple Terminal support for Mac sample app #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Implement TERM_SESSION_ID and Apple Terminal support for Mac sample app #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55131ed
Initial plan
Copilot Sep 3, 2025
5c9fc39
Implement TERM_SESSION_ID and Apple Terminal support for Mac sample app
Copilot Sep 3, 2025
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
32 changes: 32 additions & 0 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion TerminalApp/MacTerminal/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import Cocoa
import SwiftTerm
import UniformTypeIdentifiers
import Foundation
class ViewController: NSViewController, LocalProcessTerminalViewDelegate, NSUserInterfaceValidations {
@IBOutlet var loggingMenuItem: NSMenuItem?

Expand All @@ -18,6 +19,9 @@ class ViewController: NSViewController, LocalProcessTerminalViewDelegate, NSUser
var postedTitle: String = ""
var postedDirectory: String? = nil

// Session ID for terminal session restoration and Apple Terminal compatibility
private let termSessionId = UUID().uuidString

func sizeChanged(source: LocalProcessTerminalView, newCols: Int, newRows: Int) {
if changingSize {
return
Expand Down Expand Up @@ -106,6 +110,19 @@ class ViewController: NSViewController, LocalProcessTerminalViewDelegate, NSUser
return String (cString: pwd.pw_shell)
}

// Creates environment variables with Apple Terminal compatibility
func getTerminalEnvironment() -> [String] {
var env = Terminal.getEnvironmentVariables(termName: "xterm-256color")

// Add Apple Terminal program identification for directory tracking support
env.append("TERM_PROGRAM=Apple_Terminal")

// Add session ID for session restoration support
env.append("TERM_SESSION_ID=\(termSessionId)")

return env
}

class TD: TerminalDelegate {
func send(source: Terminal, data: ArraySlice<UInt8>) {
}
Expand All @@ -132,9 +149,10 @@ class ViewController: NSViewController, LocalProcessTerminalViewDelegate, NSUser

let shell = getShell()
let shellIdiom = "-" + NSString(string: shell).lastPathComponent
let environment = getTerminalEnvironment()

FileManager.default.changeCurrentDirectoryPath (FileManager.default.homeDirectoryForCurrentUser.path)
terminal.startProcess (executable: shell, execName: shellIdiom)
terminal.startProcess (executable: shell, execName: shellIdiom, environment: environment)
view.addSubview(terminal)
logging = NSUserDefaultsController.shared.defaults.bool(forKey: "LogHostOutput")
updateLogging ()
Expand Down