Skip to content

feat(control): 原生 CLI 读写终端与本地/Web 控制提示 #132

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

Merged
defia merged 7 commits into from
Nov 3, 2026
Merged

feat(control): 原生 CLI 读写终端与本地/Web 控制提示 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5657cd1
feat(control): add gated CLI access and visible control activity
defia Oct 25, 2026
883cd28
fix(cli): recognize help after global socket options
defia Oct 25, 2026
fa68145
fix(localization): remove unused control strings
defia Oct 25, 2026
4084b5b
fix(cli): scan only new response bytes for delimiters
defia Oct 25, 2026
51c36ac
fix(control): address background access and CLI review findings
defia Oct 27, 2026
db1934b
fix(control): guard history restore and preserve existing CLI links
defia Oct 27, 2026
dbd71fe
docs(cli): clarify background access after restart
defia Oct 28, 2026
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ jobs:

scripts/verify-ghostty-resources.sh build/Build/Products/Debug/Glint.app

- name: Test bundled CLI
run: python3 scripts/test-cli.py build/Build/Products/Debug/Glint.app/Contents/Helpers/glint

- name: Test Web Remote browser input
run: node --test scripts/test-web-remote-*.mjs

Expand Down
306 changes: 306 additions & 0 deletions CLI/main.swift
View file
Open in desktop

Large diffs are not rendered by default.

139 changes: 139 additions & 0 deletions Glint.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
21C03B3AE912F4D30FA6F92C /* PaneAgentState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41DDB9C7B5A277B7924270A3 /* PaneAgentState.swift */; };
2218BACA355875F975446783 /* GhosttySurfaceAccessibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 454D414FF362C09886EA963F /* GhosttySurfaceAccessibility.swift */; };
262CB25BEB2B28B12C162F66 /* ghostty in Resources */ = {isa = PBXBuildFile; fileRef = 1CD90B7C77381E05E8A2BA8C /* ghostty */; };
2B4E37FBF98983D80AC6D093 /* ControlBridgeIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0759D0452D589BAA2384D9D3 /* ControlBridgeIntegrationTests.swift */; };
2D9012046800A06555DEA381 /* GitRefreshCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65BE76E8E627A5347D565968 /* GitRefreshCoordinatorTests.swift */; };
2DD19A3FDAE094EF32B0B9F0 /* zsh-autosuggestions.zsh in Resources */ = {isa = PBXBuildFile; fileRef = D03AFC613028C5BB0D99238D /* zsh-autosuggestions.zsh */; };
2E52C3AC5AD998CD3604D6BE /* GhosttyKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81DADCF27E710CC77846E961 /* GhosttyKit.xcframework */; };
Expand All @@ -44,8 +45,11 @@
4ED4428EEC2AFB777092FAEF /* ShellRcBlockTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B91F000C01FEA1C7E61F5A /* ShellRcBlockTests.swift */; };
5157C5439862F21202BCC44D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E67CF5D8552AE1F51386161 /* AppDelegate.swift */; };
57D99FDEAF8596DCDBC55ABE /* GrokHookInstallerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BDAAD70DC4C2FC80F6DEA51 /* GrokHookInstallerTests.swift */; };
59A68E0E396F948F6CDA7984 /* CLIInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D247212AF50E779FC07DD96 /* CLIInstallation.swift */; };
6290F26DFE2D0D5E1FEB9FA9 /* GitRefreshCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBB695363FAF3A996EF0C9FF /* GitRefreshCoordinator.swift */; };
632C9446752A79B9C95A5D0D /* addon-fit-LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 677808A57BE53607DA391FC8 /* addon-fit-LICENSE.txt */; };
66F384C4ABAC9DE1CC7E2C49 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CDC0A8429C70EC3F4D3532A /* main.swift */; };
679D2F2C16D2459A356A3559 /* CLIInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D247212AF50E779FC07DD96 /* CLIInstallation.swift */; };
692D1A7D490E07D796535EAA /* UpdaterController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4408F9761E584DE2AB6630E2 /* UpdaterController.swift */; };
6B6B183329BCCDE5474D88AF /* web-remote.css in Resources */ = {isa = PBXBuildFile; fileRef = ABF0871355239B5D7C80B719 /* web-remote.css */; };
6BE78104E4CC97417ED400B4 /* xterm.mjs in Resources */ = {isa = PBXBuildFile; fileRef = 36D0A3B6CB143C412B8EDA7B /* xterm.mjs */; };
Expand Down Expand Up @@ -112,6 +116,13 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
09ABC4E3016909C2F99F4393 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE6DB378EC4FB00E8DB46BA7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 0B917384056BCF13B6E0D69C;
remoteInfo = GlintCLI;
};
E573422D753FD4F162230F22 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE6DB378EC4FB00E8DB46BA7 /* Project object */;
Expand All @@ -125,11 +136,15 @@
01DD41E0F48A7A20C41F3AE6 /* AccessibilityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityTests.swift; sourceTree = "<group>"; };
050E267AE14712D4D6633B4F /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
05F2CA2243872C8111048EF2 /* AgentBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgentBridge.swift; sourceTree = "<group>"; };
0759D0452D589BAA2384D9D3 /* ControlBridgeIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlBridgeIntegrationTests.swift; sourceTree = "<group>"; };
07C2CEDE2C717743C29E6026 /* web-remote.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "web-remote.js"; sourceTree = "<group>"; };
08FC2FBC9E8729A5ECBF857C /* PaneView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaneView.swift; sourceTree = "<group>"; };
0C5FD3EEA1ECD40F78394862 /* AgentLaunchChooser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgentLaunchChooser.swift; sourceTree = "<group>"; };
0D29C0D2447094B07854C193 /* NewWorkspaceSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewWorkspaceSheet.swift; sourceTree = "<group>"; };
0D5B5D0462A1225A56E6EE85 /* AEBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AEBridge.m; sourceTree = "<group>"; };
358C545756026B40E9358E3C /* glint */ = {isa = PBXFileReference; includeInIndex = 0; path = glint; sourceTree = BUILT_PRODUCTS_DIR; };
6CDC0A8429C70EC3F4D3532A /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
8D247212AF50E779FC07DD96 /* CLIInstallation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLIInstallation.swift; sourceTree = "<group>"; };
9F3D06E27B4C15A8D2E93B50 /* ChildWindowExceptionGuard.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChildWindowExceptionGuard.m; sourceTree = "<group>"; };
0D751E30DFF2EFA6F705A374 /* GhosttyTickSchedulerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GhosttyTickSchedulerTests.swift; sourceTree = "<group>"; };
0F58E2127BAE2C9F5155CF07 /* DevinHookInstallerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DevinHookInstallerTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -313,6 +328,7 @@
6AB338782EF6F22B7B381DA8 /* CodexHomeStoreTests.swift */,
26141150D2DB4C0589558ECC /* CodexHookInstallerTests.swift */,
0FBF22AEC81DBE92987A8CB4 /* CodexUsageReaderTests.swift */,
0759D0452D589BAA2384D9D3 /* ControlBridgeIntegrationTests.swift */,
0F58E2127BAE2C9F5155CF07 /* DevinHookInstallerTests.swift */,
7D42F0B915C6A38E640B2C71 /* ExceptionBackstopTests.swift */,
0D751E30DFF2EFA6F705A374 /* GhosttyTickSchedulerTests.swift */,
Expand Down Expand Up @@ -380,6 +396,14 @@
path = Git;
sourceTree = "<group>";
};
784B713652B6DC2C1F133E7D /* Shared */ = {
isa = PBXGroup;
children = (
8D247212AF50E779FC07DD96 /* CLIInstallation.swift */,
);
path = Shared;
sourceTree = "<group>";
};
846EE2A0E01AF110EE275AFD /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -448,6 +472,14 @@
path = Glint;
sourceTree = "<group>";
};
C7CCB0F28353CD96F7329EF3 /* CLI */ = {
isa = PBXGroup;
children = (
6CDC0A8429C70EC3F4D3532A /* main.swift */,
);
path = CLI;
sourceTree = "<group>";
};
CE6E633968E3B9EE7F187610 /* App */ = {
isa = PBXGroup;
children = (
Expand All @@ -474,9 +506,11 @@
EA6921C9B6CB486D18C07534 = {
isa = PBXGroup;
children = (
C7CCB0F28353CD96F7329EF3 /* CLI */,
62413EC8DC0D611EDA5E85CA /* GhosttyResources */,
BB4ECEBC994408CE9F33EC5A /* Glint */,
5F9010EBEE9DCDE13D866A74 /* GlintTests */,
784B713652B6DC2C1F133E7D /* Shared */,
846EE2A0E01AF110EE275AFD /* Frameworks */,
F0DEBFD467843DF4F582D172 /* Products */,
);
Expand All @@ -485,6 +519,7 @@
F0DEBFD467843DF4F582D172 /* Products */ = {
isa = PBXGroup;
children = (
358C545756026B40E9358E3C /* glint */,
3E2E78BBA22734DD486C760B /* Glint.app */,
E94AB23640CA1E6007F8B2B4 /* GlintTests.xctest */,
);
Expand All @@ -494,17 +529,36 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
0B917384056BCF13B6E0D69C /* GlintCLI */ = {
isa = PBXNativeTarget;
buildConfigurationList = F0FAAB9A0446F8A5053933E5 /* Build configuration list for PBXNativeTarget "GlintCLI" */;
buildPhases = (
E722ED3D8930B6DD121E3BF3 /* Sources */,
);
buildRules = (
);
dependencies = (
);
name = GlintCLI;
packageProductDependencies = (
);
productName = GlintCLI;
productReference = 358C545756026B40E9358E3C /* glint */;
productType = "com.apple.product-type.tool";
};
370743E3F9FFC81627C407C4 /* Glint */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4AC9F6345A7677531E105A3D /* Build configuration list for PBXNativeTarget "Glint" */;
buildPhases = (
86AD9E59837D6EEC7E56E0F0 /* Sources */,
15DB57E4B5291059A1FB8D4A /* Resources */,
98BEE1CADB909FBA0A70E63B /* Frameworks */,
D4CDAB16B8249199ECDAA28C /* Bundle Glint CLI */,
);
buildRules = (
);
dependencies = (
801F4A62BCA14E5741DC1DE4 /* PBXTargetDependency */,
);
name = Glint;
packageProductDependencies = (
Expand Down Expand Up @@ -566,6 +620,7 @@
projectRoot = "";
targets = (
370743E3F9FFC81627C407C4 /* Glint */,
0B917384056BCF13B6E0D69C /* GlintCLI */,
900A6C235CB23B81714F0821 /* GlintTests */,
);
};
Expand Down Expand Up @@ -603,6 +658,29 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
D4CDAB16B8249199ECDAA28C /* Bundle Glint CLI */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(BUILT_PRODUCTS_DIR)/glint",
);
name = "Bundle Glint CLI";
outputFileListPaths = (
);
outputPaths = (
"$(TARGET_BUILD_DIR)/$(CONTENTS_FOLDER_PATH)/Helpers/glint",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "set -eu\n/bin/mkdir -p \"$TARGET_BUILD_DIR/$CONTENTS_FOLDER_PATH/Helpers\"\n/bin/cp \"$BUILT_PRODUCTS_DIR/glint\" \"$TARGET_BUILD_DIR/$CONTENTS_FOLDER_PATH/Helpers/glint\"\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
3827C1790EDA945C32F356F3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand All @@ -616,6 +694,7 @@
C41119D04864077E5B554F59 /* CodexHomeStoreTests.swift in Sources */,
0FEECB27EB1ACE11E29ECCEF /* CodexHookInstallerTests.swift in Sources */,
FEBC3158CB471E9ABDF931BB /* CodexUsageReaderTests.swift in Sources */,
2B4E37FBF98983D80AC6D093 /* ControlBridgeIntegrationTests.swift in Sources */,
34997DD4A4F9B64A754FE77F /* DevinHookInstallerTests.swift in Sources */,
3A6E1C48B27D05F49E31A8D0 /* ExceptionBackstopTests.swift in Sources */,
180444BD20493AE4822BD372 /* GhosttyTickSchedulerTests.swift in Sources */,
Expand Down Expand Up @@ -653,6 +732,7 @@
C95E09498A4974B811D36575 /* AgentLaunchChooser.swift in Sources */,
C48BD1224EA2C6D3C87B9120 /* AgentPaneSummary.swift in Sources */,
5157C5439862F21202BCC44D /* AppDelegate.swift in Sources */,
59A68E0E396F948F6CDA7984 /* CLIInstallation.swift in Sources */,
D0C5A885F5B3FE6BD5AFC54A /* CloseOnCmdW.swift in Sources */,
07817DC6A98F8ED2E236CFA1 /* CodexHome.swift in Sources */,
C0E8D97C08BA3F0FA33F31E7 /* CommandPalette.swift in Sources */,
Expand Down Expand Up @@ -696,9 +776,23 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
E722ED3D8930B6DD121E3BF3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
679D2F2C16D2459A356A3559 /* CLIInstallation.swift in Sources */,
66F384C4ABAC9DE1CC7E2C49 /* main.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
801F4A62BCA14E5741DC1DE4 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 0B917384056BCF13B6E0D69C /* GlintCLI */;
targetProxy = 09ABC4E3016909C2F99F4393 /* PBXContainerItemProxy */;
};
D3E9FF39F2716E0829281863 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 370743E3F9FFC81627C407C4 /* Glint */;
Expand Down Expand Up @@ -770,6 +864,24 @@
};
name = Release;
};
44EEA4A9F2E5095CB782DC20 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = app.glint.GlintCLI;
PRODUCT_MODULE_NAME = GlintCLI;
PRODUCT_NAME = glint;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Debug;
};
737FFBE4050FEC0AF1931C18 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -853,6 +965,24 @@
};
name = Release;
};
B067B73C976D1E7F2C606CBF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = app.glint.GlintCLI;
PRODUCT_MODULE_NAME = GlintCLI;
PRODUCT_NAME = glint;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Release;
};
D716E255757C327EE86E1B65 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -988,6 +1118,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
F0FAAB9A0446F8A5053933E5 /* Build configuration list for PBXNativeTarget "GlintCLI" */ = {
isa = XCConfigurationList;
buildConfigurations = (
44EEA4A9F2E5095CB782DC20 /* Debug */,
B067B73C976D1E7F2C606CBF /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
Expand Down
Loading
Loading