diff --git a/gen-go-code.py b/gen-go-code.py
index 4bec19271..402b5fe6a 100755
--- a/gen-go-code.py
+++ b/gen-go-code.py
@@ -441,6 +441,7 @@ def load_ref_map() -> Dict[str, Dict[str, str]]:
 
 
 def generate_constants() -> str:
+    from kitty.options.types import Options
     ref_map = load_ref_map()
     dp = ", ".join(map(lambda x: f'"{serialize_as_go_string(x)}"', kc.default_pager_for_help))
     return f'''\
@@ -464,6 +465,11 @@ var CharacterKeyNameAliases = map[string]string{serialize_go_dict(character_key_
 var ConfigModMap = map[string]uint16{serialize_go_dict(config_mod_map)}
 var RefMap = map[string]string{serialize_go_dict(ref_map['ref'])}
 var DocTitleMap = map[string]string{serialize_go_dict(ref_map['doc'])}
+var KittyConfigDefaults = struct {{
+Term, Shell_integration string
+}}{{
+Term: "{Options.term}", Shell_integration: "{Options.shell_integration}",
+}}
 '''  # }}}
 
 
@@ -682,7 +688,7 @@ def generate_ssh_kitten_data() -> None:
             buf.write(data)
             size = len(data)
             fmap[f] = pos, size
-        mapping = ','.join(f'{name} {pos[0]} {pos[1]}' for name, pos in fmap.items()).encode('ascii')
+        mapping = ','.join(f'{name} {pos[0]} {pos[1]}' for name, pos in sorted(fmap.items())).encode('ascii')
         data = struct.pack('<I', len(fmap)) + mapping + b'\n' + buf.getvalue()
         with open(dest, 'wb') as d:
             write_compressed_data(data, d)
diff --git a/tools/cmd/ssh/main.go b/tools/cmd/ssh/main.go
index f758852f8..e7abaf5e9 100644
--- a/tools/cmd/ssh/main.go
+++ b/tools/cmd/ssh/main.go
@@ -171,6 +171,7 @@ type connection_data struct {
 
 func run_ssh(ssh_args, server_args, found_extra_args []string) (rc int, err error) {
 	go Data()
+	go RelevantKittyOpts()
 	cmd := append([]string{SSHExe()}, ssh_args...)
 	cd := connection_data{remote_args: server_args[1:]}
 	hostname := server_args[0]
diff --git a/tools/cmd/ssh/utils.go b/tools/cmd/ssh/utils.go
index 1f1af9c4c..f0708994f 100644
--- a/tools/cmd/ssh/utils.go
+++ b/tools/cmd/ssh/utils.go
@@ -5,8 +5,11 @@ package ssh
 import (
 	"fmt"
 	"io"
+	"kitty"
+	"kitty/tools/config"
 	"kitty/tools/utils"
 	"os/exec"
+	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
@@ -219,3 +222,23 @@ var GetSSHVersion = (&utils.Once[SSHVersion]{Run: func() SSHVersion {
 	}
 	return SSHVersion{}
 }}).Get
+
+type KittyOpts struct {
+	Term, Shell_integration string
+}
+
+var RelevantKittyOpts = (&utils.Once[KittyOpts]{Run: func() KittyOpts {
+	ans := KittyOpts{Term: kitty.KittyConfigDefaults.Term, Shell_integration: kitty.KittyConfigDefaults.Shell_integration}
+	handle_line := func(key, val string) error {
+		switch key {
+		case "term":
+			ans.Term = strings.TrimSpace(val)
+		case "shell_integration":
+			ans.Shell_integration = strings.TrimSpace(val)
+		}
+		return nil
+	}
+	cp := config.ConfigParser{LineHandler: handle_line}
+	cp.ParseFiles(filepath.Join(utils.ConfigDir(), "kitty.conf"))
+	return ans
+}}).Get
diff --git a/tools/cmd/ssh/utils_test.go b/tools/cmd/ssh/utils_test.go
index b4852e9d5..36a010878 100644
--- a/tools/cmd/ssh/utils_test.go
+++ b/tools/cmd/ssh/utils_test.go
@@ -4,8 +4,11 @@ package ssh
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 	"testing"
 
+	"kitty/tools/utils"
 	"kitty/tools/utils/shlex"
 
 	"github.com/google/go-cmp/cmp"
@@ -51,3 +54,17 @@ func TestParseSSHArgs(t *testing.T) {
 	p(`-46p23 -S/moose -W x:6 -- localhost sh -c "a b"`, `-4 -6 -p 23 -S /moose -W x:6`, `localhost sh -c "a b"`, ``, false)
 	p(`--kitten=abc -np23 --kitten xyz host`, `-n -p 23`, `host`, `--kitten abc --kitten xyz`, true)
 }
+
+func TestRelevantKittyOpts(t *testing.T) {
+	tdir := t.TempDir()
+	orig := utils.ConfigDir
+	utils.ConfigDir = func() string { return tdir }
+	defer func() { utils.ConfigDir = orig }()
+	os.WriteFile(filepath.Join(tdir, "kitty.conf"), []byte("term XXX\nshell_integration changed\nterm abcd"), 0o600)
+	if RelevantKittyOpts().Term != "abcd" {
+		t.Fatalf("Unexpected TERM: %s", RelevantKittyOpts().Term)
+	}
+	if RelevantKittyOpts().Shell_integration != "changed" {
+		t.Fatalf("Unexpected shell_integration: %s", RelevantKittyOpts().Shell_integration)
+	}
+}