Skip to content

Commit 79f07fb

Browse files
committed
feat: add explicit wake apply and inert skill install
1 parent 2eb0000 commit 79f07fb

73 files changed

Lines changed: 5675 additions & 430 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 60 additions & 30 deletions
Large diffs are not rendered by default.

‎cmd/cyberagent-desktop/main_windows.go‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ type desktopOptions struct {
5252
modelControl bool
5353
fileEditReview bool
5454
runWakeControl bool
55+
fileEditApply bool
56+
runWakeExecution bool
57+
skillInstallation bool
5558
version bool
5659
}
5760

@@ -194,6 +197,12 @@ func parseDesktopOptions(args []string) (desktopOptions, error) {
194197
"enable review-only file edit approval or denial without applying files")
195198
runWakeControl := fs.Bool("enable-run-wake", false,
196199
"enable durable bounded Run wake intent scheduling and cancellation")
200+
fileEditApply := fs.Bool("enable-file-edit-apply", false,
201+
"enable independently authorized approved FileEdit application")
202+
runWakeExecution := fs.Bool("enable-run-wake-execution", false,
203+
"enable explicitly launched foreground wake execution")
204+
skillInstallation := fs.Bool("enable-skill-installation", false,
205+
"enable confirmed inert Skill package installation")
197206
version := fs.Bool("version", false, "print version and exit")
198207
if err := fs.Parse(args); err != nil {
199208
return desktopOptions{}, err
@@ -211,6 +220,9 @@ func parseDesktopOptions(args []string) (desktopOptions, error) {
211220
modelControl: *modelControl,
212221
fileEditReview: *fileEditReview,
213222
runWakeControl: *runWakeControl,
223+
fileEditApply: *fileEditApply,
224+
runWakeExecution: *runWakeExecution,
225+
skillInstallation: *skillInstallation,
214226
version: *version}, nil
215227
}
216228

@@ -234,16 +246,19 @@ func runDesktop(config desktopOptions) error {
234246
if config.profileControl || config.runCreation || config.sessionMessages ||
235247
config.sessionSteeringControl || config.runLifecycle || config.runExecution ||
236248
config.planDeliveryControl || config.approvalControl || config.modelControl ||
237-
config.fileEditReview || config.runWakeControl {
249+
config.fileEditReview || config.runWakeControl || config.fileEditApply ||
250+
config.runWakeExecution || config.skillInstallation {
238251
controlToken, err = httpapi.GenerateAccessToken()
239252
if err != nil {
240253
return err
241254
}
242255
}
243256

244-
databasePath := filepath.Join(app.DefaultHome(), "cyberagent.db")
257+
homePath := app.DefaultHome()
258+
databasePath := filepath.Join(homePath, "cyberagent.db")
245259
controlPlane, err := desktop.OpenControlPlane(desktop.ControlPlaneConfig{
246-
DatabasePath: databasePath, ReadToken: readToken, ControlToken: controlToken,
260+
DatabasePath: databasePath, HomePath: homePath, ReadToken: readToken,
261+
ControlToken: controlToken,
247262
RunControlEnabled: config.profileControl, RunCreationEnabled: config.runCreation,
248263
SessionMessageEnabled: config.sessionMessages,
249264
SessionSteeringControlEnabled: config.sessionSteeringControl,
@@ -254,6 +269,9 @@ func runDesktop(config desktopOptions) error {
254269
ModelControlEnabled: config.modelControl,
255270
FileEditReviewEnabled: config.fileEditReview,
256271
RunWakeControlEnabled: config.runWakeControl,
272+
FileEditApplyEnabled: config.fileEditApply,
273+
RunWakeExecutionEnabled: config.runWakeExecution,
274+
SkillInstallationEnabled: config.skillInstallation,
257275
AppVersion: app.Version, UIHandler: bundle,
258276
})
259277
if err != nil {
@@ -277,7 +295,11 @@ func runDesktop(config desktopOptions) error {
277295
ModelControlEnabled: config.modelControl,
278296
FileEditReviewEnabled: config.fileEditReview,
279297
RunWakeControlEnabled: config.runWakeControl,
280-
AppVersion: app.Version, UIDigest: bundle.Digest(), Selector: selector, PreviewBridge: preview,
298+
FileEditApplyEnabled: config.fileEditApply,
299+
RunWakeExecutionEnabled: config.runWakeExecution,
300+
SkillInstallationEnabled: config.skillInstallation,
301+
AppVersion: app.Version, UIDigest: bundle.Digest(), Selector: selector,
302+
PreviewBridge: preview, SkillInstaller: controlPlane.SkillInstaller(),
281303
})
282304
if err != nil {
283305
return err

‎cmd/cyberagent-desktop/main_windows_test.go‎

Lines changed: 19 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -25,119 +25,38 @@ type testWindowRestorer struct {
2525
func (r *testWindowRestorer) Unminimise(context.Context) { r.unminimised++ }
2626
func (r *testWindowRestorer) Show(context.Context) { r.shown++ }
2727

28-
func TestDesktopOptionsDefaultToReadOnlyAndRequireExplicitProfileControl(t *testing.T) {
28+
func TestDesktopOptionsDefaultToReadOnlyAndRequireExplicitCapabilities(t *testing.T) {
2929
defaults, err := parseDesktopOptions(nil)
3030
if err != nil {
3131
t.Fatal(err)
3232
}
33-
if defaults.profileControl || defaults.runCreation || defaults.sessionMessages ||
34-
defaults.sessionSteeringControl || defaults.runLifecycle || defaults.runExecution ||
35-
defaults.planDeliveryControl || defaults.approvalControl ||
36-
defaults.modelControl || defaults.fileEditReview || defaults.runWakeControl ||
37-
defaults.version {
33+
if defaults != (desktopOptions{}) {
3834
t.Fatalf("unexpected defaults: %#v", defaults)
3935
}
40-
enabled, err := parseDesktopOptions([]string{"--enable-profile-control"})
41-
if err != nil {
42-
t.Fatal(err)
43-
}
44-
if !enabled.profileControl || enabled.runCreation || enabled.sessionMessages ||
45-
enabled.sessionSteeringControl || enabled.runLifecycle || enabled.runExecution ||
46-
enabled.planDeliveryControl || enabled.approvalControl ||
47-
enabled.modelControl || enabled.fileEditReview || enabled.runWakeControl ||
48-
enabled.version {
49-
t.Fatalf("profile control was not explicit: %#v", enabled)
50-
}
51-
creation, err := parseDesktopOptions([]string{"--enable-run-creation"})
52-
if err != nil {
53-
t.Fatal(err)
54-
}
55-
if creation.profileControl || !creation.runCreation || creation.sessionMessages ||
56-
creation.sessionSteeringControl || creation.runLifecycle || creation.runExecution ||
57-
creation.planDeliveryControl || creation.approvalControl ||
58-
creation.modelControl || creation.fileEditReview || creation.runWakeControl ||
59-
creation.version {
60-
t.Fatalf("Run creation was not independently explicit: %#v", creation)
61-
}
62-
messages, err := parseDesktopOptions([]string{"--enable-session-messages"})
63-
if err != nil {
64-
t.Fatal(err)
65-
}
66-
if messages.profileControl || messages.runCreation || !messages.sessionMessages ||
67-
messages.sessionSteeringControl || messages.runLifecycle || messages.runExecution ||
68-
messages.planDeliveryControl || messages.approvalControl ||
69-
messages.modelControl || messages.fileEditReview || messages.runWakeControl ||
70-
messages.version {
71-
t.Fatalf("Session messages were not independently explicit: %#v", messages)
72-
}
73-
steering, err := parseDesktopOptions([]string{"--enable-session-steering-control"})
74-
if err != nil {
75-
t.Fatal(err)
76-
}
77-
if steering.profileControl || steering.runCreation || steering.sessionMessages ||
78-
!steering.sessionSteeringControl || steering.runLifecycle || steering.runExecution ||
79-
steering.planDeliveryControl || steering.approvalControl ||
80-
steering.modelControl || steering.fileEditReview || steering.runWakeControl ||
81-
steering.version {
82-
t.Fatalf("Session steering cancellation was not independently explicit: %#v", steering)
83-
}
84-
lifecycle, err := parseDesktopOptions([]string{"--enable-run-lifecycle"})
85-
if err != nil {
86-
t.Fatal(err)
87-
}
88-
if !lifecycle.runLifecycle || lifecycle.runExecution || lifecycle.profileControl ||
89-
lifecycle.runCreation || lifecycle.sessionMessages || lifecycle.sessionSteeringControl ||
90-
lifecycle.planDeliveryControl || lifecycle.approvalControl {
91-
t.Fatalf("Run lifecycle was not independently explicit: %#v", lifecycle)
92-
}
93-
execution, err := parseDesktopOptions([]string{"--enable-run-execution"})
94-
if err != nil {
95-
t.Fatal(err)
96-
}
97-
if !execution.runExecution || execution.runLifecycle || execution.profileControl ||
98-
execution.runCreation || execution.sessionMessages || execution.sessionSteeringControl ||
99-
execution.planDeliveryControl || execution.approvalControl {
100-
t.Fatalf("Run execution was not independently explicit: %#v", execution)
101-
}
102-
plan, err := parseDesktopOptions([]string{"--enable-plan-delivery"})
103-
if err != nil {
104-
t.Fatal(err)
105-
}
106-
if !plan.planDeliveryControl || plan.approvalControl || plan.runExecution ||
107-
plan.runLifecycle || plan.profileControl || plan.runCreation || plan.sessionMessages ||
108-
plan.sessionSteeringControl {
109-
t.Fatalf("Plan/Delivery control was not independently explicit: %#v", plan)
110-
}
111-
approvals, err := parseDesktopOptions([]string{"--enable-approvals"})
112-
if err != nil {
113-
t.Fatal(err)
114-
}
115-
if !approvals.approvalControl || approvals.planDeliveryControl || approvals.runExecution ||
116-
approvals.runLifecycle || approvals.profileControl || approvals.runCreation ||
117-
approvals.sessionMessages || approvals.sessionSteeringControl {
118-
t.Fatalf("Approval control was not independently explicit: %#v", approvals)
119-
}
12036
for _, current := range []struct {
121-
flag string
122-
check func(desktopOptions) bool
37+
flag string
38+
want desktopOptions
12339
}{
124-
{flag: "--enable-model-control", check: func(value desktopOptions) bool {
125-
return value.modelControl && !value.fileEditReview && !value.runWakeControl
126-
}},
127-
{flag: "--enable-file-edit-review", check: func(value desktopOptions) bool {
128-
return !value.modelControl && value.fileEditReview && !value.runWakeControl
129-
}},
130-
{flag: "--enable-run-wake", check: func(value desktopOptions) bool {
131-
return !value.modelControl && !value.fileEditReview && value.runWakeControl
132-
}},
40+
{flag: "--enable-profile-control", want: desktopOptions{profileControl: true}},
41+
{flag: "--enable-run-creation", want: desktopOptions{runCreation: true}},
42+
{flag: "--enable-session-messages", want: desktopOptions{sessionMessages: true}},
43+
{flag: "--enable-session-steering-control", want: desktopOptions{sessionSteeringControl: true}},
44+
{flag: "--enable-run-lifecycle", want: desktopOptions{runLifecycle: true}},
45+
{flag: "--enable-run-execution", want: desktopOptions{runExecution: true}},
46+
{flag: "--enable-plan-delivery", want: desktopOptions{planDeliveryControl: true}},
47+
{flag: "--enable-approvals", want: desktopOptions{approvalControl: true}},
48+
{flag: "--enable-model-control", want: desktopOptions{modelControl: true}},
49+
{flag: "--enable-file-edit-review", want: desktopOptions{fileEditReview: true}},
50+
{flag: "--enable-run-wake", want: desktopOptions{runWakeControl: true}},
51+
{flag: "--enable-file-edit-apply", want: desktopOptions{fileEditApply: true}},
52+
{flag: "--enable-run-wake-execution", want: desktopOptions{runWakeExecution: true}},
53+
{flag: "--enable-skill-installation", want: desktopOptions{skillInstallation: true}},
13354
} {
13455
parsed, err := parseDesktopOptions([]string{current.flag})
13556
if err != nil {
13657
t.Fatal(err)
13758
}
138-
if !current.check(parsed) || parsed.profileControl || parsed.runCreation ||
139-
parsed.sessionMessages || parsed.sessionSteeringControl || parsed.runLifecycle ||
140-
parsed.runExecution || parsed.planDeliveryControl || parsed.approvalControl {
59+
if parsed != current.want {
14160
t.Fatalf("%s was not independently explicit: %#v", current.flag, parsed)
14261
}
14362
}

0 commit comments

Comments
 (0)