agent-gear 1.1.10 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/dist/acp/bridge.d.ts.map +1 -1
  2. package/dist/acp/bridge.js +11 -2
  3. package/dist/acp/bridge.js.map +1 -1
  4. package/dist/acp/bridge.test.js +29 -0
  5. package/dist/acp/bridge.test.js.map +1 -1
  6. package/dist/acp/process-registry.d.ts +30 -0
  7. package/dist/acp/process-registry.d.ts.map +1 -0
  8. package/dist/acp/process-registry.integration.test.d.ts +2 -0
  9. package/dist/acp/process-registry.integration.test.d.ts.map +1 -0
  10. package/dist/acp/process-registry.integration.test.js +52 -0
  11. package/dist/acp/process-registry.integration.test.js.map +1 -0
  12. package/dist/acp/process-registry.js +110 -0
  13. package/dist/acp/process-registry.js.map +1 -0
  14. package/dist/acp/process-registry.test.d.ts +2 -0
  15. package/dist/acp/process-registry.test.d.ts.map +1 -0
  16. package/dist/acp/process-registry.test.js +209 -0
  17. package/dist/acp/process-registry.test.js.map +1 -0
  18. package/dist/acp/spawner.d.ts +1 -0
  19. package/dist/acp/spawner.d.ts.map +1 -1
  20. package/dist/acp/spawner.js +32 -10
  21. package/dist/acp/spawner.js.map +1 -1
  22. package/dist/fs-handler.d.ts +11 -0
  23. package/dist/fs-handler.d.ts.map +1 -1
  24. package/dist/fs-handler.js +79 -2
  25. package/dist/fs-handler.js.map +1 -1
  26. package/dist/fs-handler.test.js +78 -1
  27. package/dist/fs-handler.test.js.map +1 -1
  28. package/dist/index.js +32 -2
  29. package/dist/index.js.map +1 -1
  30. package/dist/socketio-client.d.ts.map +1 -1
  31. package/dist/socketio-client.js +177 -4
  32. package/dist/socketio-client.js.map +1 -1
  33. package/dist/worktree-handler.d.ts +12 -1
  34. package/dist/worktree-handler.d.ts.map +1 -1
  35. package/dist/worktree-handler.js +28 -2
  36. package/dist/worktree-handler.js.map +1 -1
  37. package/package.json +1 -1
  38. package/src/acp/bridge.test.ts +37 -0
  39. package/src/acp/bridge.ts +11 -2
  40. package/src/acp/process-registry.integration.test.ts +65 -0
  41. package/src/acp/process-registry.test.ts +239 -0
  42. package/src/acp/process-registry.ts +139 -0
  43. package/src/acp/spawner.ts +26 -10
  44. package/src/fs-handler.test.ts +106 -2
  45. package/src/fs-handler.ts +88 -3
  46. package/src/index.ts +27 -2
  47. package/src/socketio-client.ts +176 -5
  48. package/src/worktree-handler.ts +41 -2
  49. package/tests/acp-spawner.test.ts +58 -26
  50. package/tests/fs-handler.test.ts +63 -0
  51. package/tests/socketio-client.test.ts +288 -0
@@ -0,0 +1,209 @@
1
+ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
2
+ import { join } from 'path';
3
+ import { homedir } from 'os';
4
+ const REGISTRY_DIR = join(homedir(), '.zag');
5
+ const REGISTRY_FILE = join(REGISTRY_DIR, 'processes.json');
6
+ vi.mock('fs', () => ({
7
+ existsSync: vi.fn(() => false),
8
+ readFileSync: vi.fn(() => { throw new Error('ENOENT'); }),
9
+ writeFileSync: vi.fn(),
10
+ mkdirSync: vi.fn(),
11
+ renameSync: vi.fn(),
12
+ unlinkSync: vi.fn(),
13
+ }));
14
+ vi.mock('os', () => ({
15
+ homedir: vi.fn(() => '/home/test'),
16
+ tmpdir: vi.fn(() => '/tmp'),
17
+ }));
18
+ import { ProcessRegistry } from './process-registry.js';
19
+ import { existsSync, readFileSync, writeFileSync, mkdirSync, renameSync } from 'fs';
20
+ function getMockFs() {
21
+ return {
22
+ existsSync: vi.mocked(existsSync),
23
+ readFileSync: vi.mocked(readFileSync),
24
+ writeFileSync: vi.mocked(writeFileSync),
25
+ mkdirSync: vi.mocked(mkdirSync),
26
+ renameSync: vi.mocked(renameSync),
27
+ };
28
+ }
29
+ describe('ProcessRegistry', () => {
30
+ let registry;
31
+ let fs;
32
+ let processKillSpy;
33
+ beforeEach(() => {
34
+ vi.clearAllMocks();
35
+ fs = getMockFs();
36
+ processKillSpy = vi.spyOn(process, 'kill').mockReturnValue(true);
37
+ // Default: file doesn't exist
38
+ fs.existsSync.mockReturnValue(false);
39
+ registry = new ProcessRegistry();
40
+ });
41
+ afterEach(() => {
42
+ processKillSpy.mockRestore();
43
+ });
44
+ describe('constructor / load', () => {
45
+ it('should create empty registry when file does not exist', () => {
46
+ expect(registry.list()).toEqual([]);
47
+ });
48
+ it('should create empty registry on malformed JSON', () => {
49
+ fs.existsSync.mockReturnValue(true);
50
+ fs.readFileSync.mockReturnValue('not valid json{{{');
51
+ const reg = new ProcessRegistry();
52
+ expect(reg.list()).toEqual([]);
53
+ });
54
+ it('should create empty registry on invalid schema (missing version)', () => {
55
+ fs.existsSync.mockReturnValue(true);
56
+ fs.readFileSync.mockReturnValue(JSON.stringify({ processes: [] }));
57
+ const reg = new ProcessRegistry();
58
+ expect(reg.list()).toEqual([]);
59
+ });
60
+ it('should create empty registry on invalid schema (missing processes)', () => {
61
+ fs.existsSync.mockReturnValue(true);
62
+ fs.readFileSync.mockReturnValue(JSON.stringify({ version: 1 }));
63
+ const reg = new ProcessRegistry();
64
+ expect(reg.list()).toEqual([]);
65
+ });
66
+ it('should load alive processes from registry file', () => {
67
+ fs.existsSync.mockReturnValue(true);
68
+ fs.readFileSync.mockReturnValue(JSON.stringify({
69
+ version: 1,
70
+ processes: [
71
+ { sessionId: 's1', pid: process.pid, cwd: '/tmp', acpServerType: 'opencode', startedAt: '2026-01-01T00:00:00Z' },
72
+ ],
73
+ }));
74
+ // process.kill(pid, 0) returns true for current process
75
+ processKillSpy.mockImplementation((pid, _sig) => {
76
+ if (_sig === 0 && pid === process.pid)
77
+ return true;
78
+ throw new Error('ESRCH');
79
+ });
80
+ const reg = new ProcessRegistry();
81
+ expect(reg.list()).toHaveLength(1);
82
+ expect(reg.get('s1')).toBeDefined();
83
+ });
84
+ it('should treat EPERM (process owned by another user) as alive', () => {
85
+ fs.existsSync.mockReturnValue(true);
86
+ fs.readFileSync.mockReturnValue(JSON.stringify({
87
+ version: 1,
88
+ processes: [
89
+ { sessionId: 's1', pid: 4242, cwd: '/tmp', acpServerType: 'opencode', startedAt: '2026-01-01T00:00:00Z' },
90
+ ],
91
+ }));
92
+ processKillSpy.mockImplementation(() => {
93
+ const err = new Error('kill EPERM');
94
+ err.code = 'EPERM';
95
+ throw err;
96
+ });
97
+ const reg = new ProcessRegistry();
98
+ expect(reg.list()).toHaveLength(1);
99
+ expect(reg.get('s1')).toBeDefined();
100
+ });
101
+ it('should prune dead processes on load and rewrite file', () => {
102
+ fs.existsSync.mockReturnValue(true);
103
+ fs.readFileSync.mockReturnValue(JSON.stringify({
104
+ version: 1,
105
+ processes: [
106
+ { sessionId: 's1', pid: 99999, cwd: '/tmp', acpServerType: 'opencode', startedAt: '2026-01-01T00:00:00Z' },
107
+ ],
108
+ }));
109
+ // pid 99999 is dead
110
+ processKillSpy.mockImplementation(() => { throw new Error('ESRCH'); });
111
+ const reg = new ProcessRegistry();
112
+ expect(reg.list()).toHaveLength(0);
113
+ // Should have rewritten file with empty list
114
+ expect(fs.writeFileSync).toHaveBeenCalled();
115
+ });
116
+ });
117
+ describe('register', () => {
118
+ it('should register a process', () => {
119
+ registry.register('s1', { pid: 1234, cwd: '/tmp/project', acpServerType: 'opencode' });
120
+ const entry = registry.get('s1');
121
+ expect(entry).toBeDefined();
122
+ expect(entry.pid).toBe(1234);
123
+ expect(entry.cwd).toBe('/tmp/project');
124
+ expect(entry.acpServerType).toBe('opencode');
125
+ });
126
+ it('should persist to file on register', () => {
127
+ registry.register('s1', { pid: 1234, cwd: '/tmp', acpServerType: 'opencode' });
128
+ expect(fs.writeFileSync).toHaveBeenCalled();
129
+ const written = JSON.parse(fs.writeFileSync.mock.calls[0][1]);
130
+ expect(written.version).toBe(1);
131
+ expect(written.processes).toHaveLength(1);
132
+ expect(written.processes[0].sessionId).toBe('s1');
133
+ });
134
+ it('should write the temp file inside REGISTRY_DIR (same-filesystem atomic rename)', () => {
135
+ registry.register('s1', { pid: 1234, cwd: '/tmp', acpServerType: 'opencode' });
136
+ const tmpPath = fs.writeFileSync.mock.calls[0][0];
137
+ expect(tmpPath.startsWith(REGISTRY_DIR)).toBe(true);
138
+ expect(tmpPath).not.toBe(REGISTRY_FILE);
139
+ expect(fs.renameSync).toHaveBeenCalledWith(tmpPath, REGISTRY_FILE);
140
+ });
141
+ it('should not throw when flush fails (e.g. unwritable directory)', () => {
142
+ fs.writeFileSync.mockImplementation(() => { throw new Error('EROFS: read-only file system'); });
143
+ expect(() => registry.register('s1', { pid: 1234, cwd: '/tmp', acpServerType: 'opencode' })).not.toThrow();
144
+ expect(registry.get('s1')).toBeDefined();
145
+ });
146
+ it('should use provided startedAt', () => {
147
+ registry.register('s1', { pid: 1234, cwd: '/tmp', acpServerType: 'opencode', startedAt: '2026-01-01' });
148
+ expect(registry.get('s1').startedAt).toBe('2026-01-01');
149
+ });
150
+ it('should auto-generate startedAt if not provided', () => {
151
+ registry.register('s1', { pid: 1234, cwd: '/tmp', acpServerType: 'opencode' });
152
+ expect(registry.get('s1').startedAt).toBeTruthy();
153
+ });
154
+ });
155
+ describe('deregister', () => {
156
+ it('should deregister an existing entry', () => {
157
+ registry.register('s1', { pid: 1234, cwd: '/tmp', acpServerType: 'opencode' });
158
+ const result = registry.deregister('s1');
159
+ expect(result).toBe(true);
160
+ expect(registry.get('s1')).toBeUndefined();
161
+ });
162
+ it('should return false for non-existent entry', () => {
163
+ const result = registry.deregister('nonexistent');
164
+ expect(result).toBe(false);
165
+ });
166
+ it('should persist to file on deregister', () => {
167
+ registry.register('s1', { pid: 1234, cwd: '/tmp', acpServerType: 'opencode' });
168
+ vi.mocked(writeFileSync).mockClear();
169
+ registry.deregister('s1');
170
+ expect(fs.writeFileSync).toHaveBeenCalled();
171
+ });
172
+ it('should not persist if entry did not exist', () => {
173
+ vi.mocked(writeFileSync).mockClear();
174
+ registry.deregister('nonexistent');
175
+ expect(fs.writeFileSync).not.toHaveBeenCalled();
176
+ });
177
+ });
178
+ describe('list', () => {
179
+ it('should return all entries without sessionId', () => {
180
+ registry.register('s1', { pid: 111, cwd: '/a', acpServerType: 'opencode' });
181
+ registry.register('s2', { pid: 222, cwd: '/b', acpServerType: 'claude_code' });
182
+ const list = registry.list();
183
+ expect(list).toHaveLength(2);
184
+ expect(list[0]).not.toHaveProperty('sessionId');
185
+ expect(list[1]).not.toHaveProperty('sessionId');
186
+ });
187
+ });
188
+ describe('listEntries', () => {
189
+ it('should return all entries with sessionId', () => {
190
+ registry.register('s1', { pid: 111, cwd: '/a', acpServerType: 'opencode' });
191
+ const entries = registry.listEntries();
192
+ expect(entries).toHaveLength(1);
193
+ expect(entries[0].sessionId).toBe('s1');
194
+ });
195
+ });
196
+ describe('get', () => {
197
+ it('should return entry by sessionId without sessionId field', () => {
198
+ registry.register('s1', { pid: 1234, cwd: '/tmp', acpServerType: 'opencode' });
199
+ const entry = registry.get('s1');
200
+ expect(entry).toBeDefined();
201
+ expect(entry).not.toHaveProperty('sessionId');
202
+ expect(entry.pid).toBe(1234);
203
+ });
204
+ it('should return undefined for non-existent sessionId', () => {
205
+ expect(registry.get('nonexistent')).toBeUndefined();
206
+ });
207
+ });
208
+ });
209
+ //# sourceMappingURL=process-registry.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"process-registry.test.js","sourceRoot":"","sources":["../../src/acp/process-registry.test.ts"],"names":[],"mappings":"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"}
@@ -17,6 +17,7 @@ export declare class AcpSpawner {
17
17
  get stdin(): WritableStream;
18
18
  get stdout(): ReadableStream<Uint8Array>;
19
19
  get closed(): Promise<void>;
20
+ get pid(): number | null;
20
21
  stop(): void;
21
22
  isRunning(): boolean;
22
23
  private resolveCommand;
@@ -1 +1 @@
1
- {"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,OAAO,CAAgB;gBAEnB,OAAO,EAAE,iBAAiB;IAQtC,KAAK,IAAI,IAAI;IA8Bb,IAAI,KAAK,IAAI,cAAc,CAG1B;IAED,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAGvC;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1B;IAED,IAAI,IAAI,IAAI;IAmBZ,SAAS,IAAI,OAAO;IAIpB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,kBAAkB;CAW3B"}
1
+ {"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,OAAO,CAAgB;gBAEnB,OAAO,EAAE,iBAAiB;IAQtC,KAAK,IAAI,IAAI;IAqCb,IAAI,KAAK,IAAI,cAAc,CAG1B;IAED,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAGvC;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1B;IAED,IAAI,GAAG,IAAI,MAAM,GAAG,IAAI,CAEvB;IAED,IAAI,IAAI,IAAI;IAwBZ,SAAS,IAAI,OAAO;IAIpB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,kBAAkB;CAW3B"}
@@ -1,4 +1,4 @@
1
- import { spawn, execFileSync } from 'child_process';
1
+ import { spawn, execFileSync, execFile } from 'child_process';
2
2
  import { Writable, Readable } from 'node:stream';
3
3
  import { existsSync, mkdirSync } from 'fs';
4
4
  import { platform } from 'os';
@@ -26,7 +26,15 @@ export class AcpSpawner {
26
26
  stdio: ['pipe', 'pipe', 'pipe'],
27
27
  };
28
28
  if (platform() === 'win32') {
29
- spawnOptions.shell = true;
29
+ // .cmd/.bat cannot be spawned without a shell since Node 18.20.2/20.12.2
30
+ // (CVE-2024-27980, spawn throws EINVAL); real executables spawn directly
31
+ // (no shell) for reliable taskkill targeting.
32
+ if (/\.(cmd|bat)$/i.test(cmd)) {
33
+ spawnOptions.shell = true;
34
+ }
35
+ }
36
+ else {
37
+ spawnOptions.detached = true;
30
38
  }
31
39
  this.process = spawn(cmd, this.args, spawnOptions);
32
40
  this.process.stderr?.on('data', (data) => {
@@ -54,22 +62,36 @@ export class AcpSpawner {
54
62
  get closed() {
55
63
  return this._closed;
56
64
  }
65
+ get pid() {
66
+ return this.process?.pid ?? null;
67
+ }
57
68
  stop() {
58
69
  if (!this.process)
59
70
  return;
60
- if (platform() === 'win32') {
71
+ const pid = this.process.pid;
72
+ if (!pid) {
61
73
  this.process.kill();
62
- setTimeout(() => {
63
- if (this.process) {
64
- this.process.kill();
74
+ return;
75
+ }
76
+ if (platform() === 'win32') {
77
+ execFile('taskkill', ['/PID', String(pid), '/T', '/F'], (err) => {
78
+ if (err) {
79
+ try {
80
+ process.kill(pid, 'SIGKILL');
81
+ }
82
+ catch { /* process already gone */ }
65
83
  }
66
- }, 5000);
84
+ });
67
85
  }
68
86
  else {
69
- this.process.kill('SIGTERM');
87
+ process.kill(-pid, 'SIGTERM');
70
88
  setTimeout(() => {
71
- if (this.process) {
72
- this.process.kill('SIGKILL');
89
+ // Only send SIGKILL if process is still running
90
+ if (this.process && this.process.pid === pid) {
91
+ try {
92
+ process.kill(-pid, 'SIGKILL');
93
+ }
94
+ catch { /* process already gone */ }
73
95
  }
74
96
  }, 5000);
75
97
  }
@@ -1 +1 @@
1
- {"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"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"}
@@ -4,8 +4,19 @@ export interface FsMkdirResult {
4
4
  path?: string;
5
5
  error?: string;
6
6
  }
7
+ export interface FsRemoveDirResult {
8
+ success: boolean;
9
+ error?: string;
10
+ }
7
11
  export declare class FsHandler {
12
+ private allowedRoots;
13
+ /** Register a controller-managed directory; it and its subpaths become removable. */
14
+ registerAllowedPath(path: string): void;
15
+ /** Drop a previously registered directory (e.g. after it was removed). */
16
+ unregisterAllowedPath(path: string): void;
17
+ private isPathSafe;
8
18
  mkdir(parentPath: string, folderName: string): Promise<FsMkdirResult>;
19
+ removeDir(path: string): Promise<FsRemoveDirResult>;
9
20
  }
10
21
  export declare const fsHandler: FsHandler;
11
22
  //# sourceMappingURL=fs-handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"fs-handler.d.ts","sourceRoot":"","sources":["../src/fs-handler.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,SAAS;IACd,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CAS5E;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}
1
+ {"version":3,"file":"fs-handler.d.ts","sourceRoot":"","sources":["../src/fs-handler.ts"],"names":[],"mappings":"AAoCA,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,YAAY,CAAqB;IAEzC,qFAAqF;IACrF,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAMvC,0EAA0E;IAC1E,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIzC,OAAO,CAAC,UAAU;IASZ,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAarE,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAoB1D;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}
@@ -1,9 +1,64 @@
1
- import { mkdirSync } from 'fs';
2
- import { join } from 'path';
1
+ import { mkdirSync, rmSync, statSync } from 'fs';
2
+ import { join, parse, resolve, sep } from 'path';
3
+ import { homedir } from 'os';
4
+ // Security model for destructive operations (removeDir): whitelist.
5
+ // Only paths the controller itself manages may be deleted — worktree/session
6
+ // directories registered via registerAllowedPath (acp:start/acp:resume cwd,
7
+ // git:worktree:add worktreePath, fs:mkdir results, ProcessRegistry entries).
8
+ // Explicit denies (filesystem root, home dir, cwd and their ancestors,
9
+ // Windows system paths) act as defense-in-depth on top of the whitelist.
10
+ //
11
+ // mkdir is non-destructive and stays on the legacy blacklist: worktree
12
+ // creation needs to mkdir parents that are not registered yet.
13
+ const BLOCKED_PATHS = ['/etc', '/usr', '/bin', '/sbin', '/var', '/proc', '/sys'];
14
+ const WINDOWS_DENIED_PATTERNS = [
15
+ /^[a-zA-Z]:[\\/]*$/, // drive root, e.g. C:\
16
+ /^[a-zA-Z]:[\\/]+windows[\\/]*$/i, // C:\Windows
17
+ /^[a-zA-Z]:[\\/]+users[\\/]*$/i, // C:\Users root
18
+ ];
19
+ function isSameOrAncestor(candidate, target) {
20
+ return target === candidate || target.startsWith(candidate + sep);
21
+ }
22
+ function isExplicitlyDenied(rawPath, resolved) {
23
+ if (WINDOWS_DENIED_PATTERNS.some((re) => re.test(rawPath.trim())))
24
+ return true;
25
+ if (resolved === parse(resolved).root)
26
+ return true;
27
+ return isSameOrAncestor(resolved, homedir()) || isSameOrAncestor(resolved, process.cwd());
28
+ }
29
+ function isBlacklisted(targetPath) {
30
+ const resolved = resolve(targetPath);
31
+ return BLOCKED_PATHS.some((blocked) => resolved === blocked || resolved.startsWith(blocked + '/'));
32
+ }
3
33
  export class FsHandler {
34
+ allowedRoots = new Set();
35
+ /** Register a controller-managed directory; it and its subpaths become removable. */
36
+ registerAllowedPath(path) {
37
+ const resolved = resolve(path);
38
+ if (isExplicitlyDenied(path, resolved))
39
+ return;
40
+ this.allowedRoots.add(resolved);
41
+ }
42
+ /** Drop a previously registered directory (e.g. after it was removed). */
43
+ unregisterAllowedPath(path) {
44
+ this.allowedRoots.delete(resolve(path));
45
+ }
46
+ isPathSafe(targetPath) {
47
+ const resolved = resolve(targetPath);
48
+ if (isExplicitlyDenied(targetPath, resolved))
49
+ return false;
50
+ for (const root of this.allowedRoots) {
51
+ if (resolved === root || resolved.startsWith(root + sep))
52
+ return true;
53
+ }
54
+ return false;
55
+ }
4
56
  async mkdir(parentPath, folderName) {
5
57
  try {
6
58
  const fullPath = join(parentPath, folderName);
59
+ if (isBlacklisted(fullPath)) {
60
+ return { success: false, error: `Path not allowed: ${fullPath}` };
61
+ }
7
62
  mkdirSync(fullPath, { recursive: true });
8
63
  return { success: true, name: folderName, path: fullPath };
9
64
  }
@@ -11,6 +66,28 @@ export class FsHandler {
11
66
  return { success: false, error: err.message };
12
67
  }
13
68
  }
69
+ async removeDir(path) {
70
+ try {
71
+ if (!this.isPathSafe(path)) {
72
+ return { success: false, error: `Path not allowed: ${path}` };
73
+ }
74
+ // 主工作区保护(最后一道防线):git 主工作区的 .git 是目录,
75
+ // linked worktree 的 .git 是指向主仓库 gitdir 的普通文件。
76
+ // 白名单可能被会话 cwd(= 仓库根)污染,凭路径无法区分,
77
+ // 凭 .git 形态可以——含 .git 目录的路径一律拒绝删除。
78
+ try {
79
+ if (statSync(join(resolve(path), '.git')).isDirectory()) {
80
+ return { success: false, error: `Refusing to remove a git main working tree: ${path}` };
81
+ }
82
+ }
83
+ catch { /* no .git entry — not a repo root, proceed */ }
84
+ rmSync(path, { recursive: true, force: true });
85
+ return { success: true };
86
+ }
87
+ catch (err) {
88
+ return { success: false, error: err.message };
89
+ }
90
+ }
14
91
  }
15
92
  export const fsHandler = new FsHandler();
16
93
  //# sourceMappingURL=fs-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fs-handler.js","sourceRoot":"","sources":["../src/fs-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAS5B,MAAM,OAAO,SAAS;IACpB,KAAK,CAAC,KAAK,CAAC,UAAkB,EAAE,UAAkB;QAChD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAC9C,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAC7D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC;QAC3D,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC"}
1
+ {"version":3,"file":"fs-handler.js","sourceRoot":"","sources":["../src/fs-handler.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,13 @@
1
1
  import { describe, it, expect, vi, beforeEach } from 'vitest';
2
2
  vi.mock('fs', () => ({
3
3
  mkdirSync: vi.fn(),
4
+ rmSync: vi.fn(),
5
+ }));
6
+ vi.mock('os', () => ({
7
+ homedir: vi.fn(() => '/home/testuser'),
4
8
  }));
5
9
  import { FsHandler } from './fs-handler.js';
10
+ import { mkdirSync, rmSync } from 'fs';
6
11
  describe('FsHandler', () => {
7
12
  let handler;
8
13
  beforeEach(() => {
@@ -17,7 +22,6 @@ describe('FsHandler', () => {
17
22
  expect(result.path).toBe('/parent/new-folder');
18
23
  });
19
24
  it('should handle creation failure', async () => {
20
- const { mkdirSync } = await import('fs');
21
25
  vi.mocked(mkdirSync).mockImplementation(() => {
22
26
  throw new Error('EEXIST: file already exists');
23
27
  });
@@ -25,6 +29,79 @@ describe('FsHandler', () => {
25
29
  expect(result.success).toBe(false);
26
30
  expect(result.error).toBeDefined();
27
31
  });
32
+ it('should reject system-critical paths', async () => {
33
+ const result = await handler.mkdir('/etc', 'evil');
34
+ expect(result.success).toBe(false);
35
+ expect(mkdirSync).not.toHaveBeenCalled();
36
+ });
37
+ });
38
+ describe('removeDir whitelist', () => {
39
+ it('should reject the filesystem root', async () => {
40
+ const result = await handler.removeDir('/');
41
+ expect(result.success).toBe(false);
42
+ expect(rmSync).not.toHaveBeenCalled();
43
+ });
44
+ it('should reject the user home directory', async () => {
45
+ const result = await handler.removeDir('/home/testuser');
46
+ expect(result.success).toBe(false);
47
+ expect(rmSync).not.toHaveBeenCalled();
48
+ });
49
+ it('should reject ancestors of the home directory', async () => {
50
+ const result = await handler.removeDir('/home');
51
+ expect(result.success).toBe(false);
52
+ expect(rmSync).not.toHaveBeenCalled();
53
+ });
54
+ it('should reject the current working directory and its ancestors', async () => {
55
+ for (const target of [process.cwd(), '/']) {
56
+ const result = await handler.removeDir(target);
57
+ expect(result.success).toBe(false);
58
+ }
59
+ expect(rmSync).not.toHaveBeenCalled();
60
+ });
61
+ it('should reject Windows drive roots and system paths', async () => {
62
+ for (const target of ['C:\\', 'C:\\Windows', 'c:\\Users', 'D:\\']) {
63
+ const result = await handler.removeDir(target);
64
+ expect(result.success).toBe(false);
65
+ }
66
+ expect(rmSync).not.toHaveBeenCalled();
67
+ });
68
+ it('should reject arbitrary unregistered directories under home', async () => {
69
+ const result = await handler.removeDir('/home/testuser/Documents');
70
+ expect(result.success).toBe(false);
71
+ expect(rmSync).not.toHaveBeenCalled();
72
+ });
73
+ it('should allow a registered worktree path', async () => {
74
+ handler.registerAllowedPath('/home/testuser/workspaces/wt-1');
75
+ const result = await handler.removeDir('/home/testuser/workspaces/wt-1');
76
+ expect(result.success).toBe(true);
77
+ expect(rmSync).toHaveBeenCalledWith('/home/testuser/workspaces/wt-1', { recursive: true, force: true });
78
+ });
79
+ it('should allow subpaths of a registered worktree path', async () => {
80
+ handler.registerAllowedPath('/home/testuser/workspaces/wt-1');
81
+ const result = await handler.removeDir('/home/testuser/workspaces/wt-1/nested/dir');
82
+ expect(result.success).toBe(true);
83
+ expect(rmSync).toHaveBeenCalled();
84
+ });
85
+ it('should reject sibling paths that merely share a prefix', async () => {
86
+ handler.registerAllowedPath('/home/testuser/workspaces/wt-1');
87
+ const result = await handler.removeDir('/home/testuser/workspaces/wt-1-evil');
88
+ expect(result.success).toBe(false);
89
+ expect(rmSync).not.toHaveBeenCalled();
90
+ });
91
+ it('should reject a path after it is unregistered', async () => {
92
+ handler.registerAllowedPath('/home/testuser/workspaces/wt-1');
93
+ handler.unregisterAllowedPath('/home/testuser/workspaces/wt-1');
94
+ const result = await handler.removeDir('/home/testuser/workspaces/wt-1');
95
+ expect(result.success).toBe(false);
96
+ expect(rmSync).not.toHaveBeenCalled();
97
+ });
98
+ it('should refuse to register explicitly denied paths as allowed roots', async () => {
99
+ handler.registerAllowedPath('/');
100
+ handler.registerAllowedPath('/home/testuser');
101
+ expect((await handler.removeDir('/home/testuser/Documents')).success).toBe(false);
102
+ expect((await handler.removeDir('/')).success).toBe(false);
103
+ expect(rmSync).not.toHaveBeenCalled();
104
+ });
28
105
  });
29
106
  });
30
107
  //# sourceMappingURL=fs-handler.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fs-handler.test.js","sourceRoot":"","sources":["../src/fs-handler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE9D,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;CACnB,CAAC,CAAC,CAAC;AAEJ,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,OAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACrB,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YAE5D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;YACzC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAC3C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAE1D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"fs-handler.test.js","sourceRoot":"","sources":["../src/fs-handler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE9D,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;IAClB,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE;CAChB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACnB,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC;CACvC,CAAC,CAAC,CAAC;AAEJ,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAEvC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,OAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACrB,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YAE5D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAC3C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAE1D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAEnD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAE5C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YAEzD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;YAC7D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAEhD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;YAC7E,KAAK,MAAM,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,KAAK,MAAM,MAAM,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC;gBAClE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;YAC3E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;YAEnE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,OAAO,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,CAAC;YAE9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;YAEzE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,gCAAgC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1G,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;YACnE,OAAO,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,CAAC;YAE9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,2CAA2C,CAAC,CAAC;YAEpF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,OAAO,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,CAAC;YAE9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,qCAAqC,CAAC,CAAC;YAE9E,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;YAC7D,OAAO,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,CAAC;YAC9D,OAAO,CAAC,qBAAqB,CAAC,gCAAgC,CAAC,CAAC;YAEhE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;YAEzE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;YAClF,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YACjC,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YAE9C,MAAM,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClF,MAAM,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3D,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}