@angelmsger/fx 0.13.0 → 0.15.0
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.
- package/CHANGELOG.md +44 -0
- package/defaults/tools.yaml +9 -0
- package/dist/adapters/channel/wecom-channel-cli/provider.js +27 -0
- package/dist/adapters/channel/wecom-channel-cli/provider.js.map +1 -0
- package/dist/adapters/git/system-git.js +24 -4
- package/dist/adapters/git/system-git.js.map +1 -1
- package/dist/adapters/manifest-source/git-repo.js +8 -5
- package/dist/adapters/manifest-source/git-repo.js.map +1 -1
- package/dist/application/init/standalone.js +5 -18
- package/dist/application/init/standalone.js.map +1 -1
- package/dist/application/release/repo.js +4 -2
- package/dist/application/release/repo.js.map +1 -1
- package/dist/application/self/update.js +84 -27
- package/dist/application/self/update.js.map +1 -1
- package/dist/application/skill/copies.js +19 -2
- package/dist/application/skill/copies.js.map +1 -1
- package/dist/application/skill/standalone-targets.js +8 -4
- package/dist/application/skill/standalone-targets.js.map +1 -1
- package/dist/application/skill/standalone.js +24 -2
- package/dist/application/skill/standalone.js.map +1 -1
- package/dist/application/skill/tool-skills.js +26 -0
- package/dist/application/skill/tool-skills.js.map +1 -1
- package/dist/application/sync/index.js +29 -15
- package/dist/application/sync/index.js.map +1 -1
- package/dist/application/tool/install.js +10 -22
- package/dist/application/tool/install.js.map +1 -1
- package/dist/application/tool/with-skills.js +68 -0
- package/dist/application/tool/with-skills.js.map +1 -0
- package/dist/application/update/notices.js +1 -1
- package/dist/application/update/notices.js.map +1 -1
- package/dist/cli/commands/index.js +2 -0
- package/dist/cli/commands/index.js.map +1 -1
- package/dist/cli/commands/skill/update.js +17 -0
- package/dist/cli/commands/skill/update.js.map +1 -0
- package/dist/cli/preparation-view.js +2 -0
- package/dist/cli/preparation-view.js.map +1 -1
- package/dist/cli/render/exceptional.js +1 -0
- package/dist/cli/render/exceptional.js.map +1 -1
- package/dist/cli/render/tone.js +1 -0
- package/dist/cli/render/tone.js.map +1 -1
- package/dist/cli/skill-command.js +1 -1
- package/dist/cli/skill-command.js.map +1 -1
- package/dist/cli/tool-command.js +10 -5
- package/dist/cli/tool-command.js.map +1 -1
- package/dist/composition/registry.js +2 -0
- package/dist/composition/registry.js.map +1 -1
- package/dist/composition/tool-install.js +9 -0
- package/dist/composition/tool-install.js.map +1 -1
- package/dist/composition/update.js +2 -0
- package/dist/composition/update.js.map +1 -1
- package/dist/domain/capability.js +2 -0
- package/dist/domain/capability.js.map +1 -1
- package/dist/domain/release/version.js +5 -3
- package/dist/domain/release/version.js.map +1 -1
- package/dist/domain/semver.js +3 -28
- package/dist/domain/semver.js.map +1 -1
- package/dist/domain/workspace/state.js +11 -1
- package/dist/domain/workspace/state.js.map +1 -1
- package/dist/ports/git.js +2 -1
- package/dist/ports/git.js.map +1 -1
- package/package.json +1 -1
- package/skills/fx-workspace/SKILL.md +1 -1
- package/skills/fx-workspace/references/commands.md +8 -3
- package/skills/fx-workspace/references/workspace-tasks.md +6 -3
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,50 @@
|
|
|
2
2
|
|
|
3
3
|
## [Unreleased]
|
|
4
4
|
|
|
5
|
+
## 0.15.0 (2026-11-02)
|
|
6
|
+
|
|
7
|
+
### Added
|
|
8
|
+
|
|
9
|
+
- Bind the workspace capability `channel` to `wecom-channel-cli` to install the CLI and its Skill. Readiness checks the local broker through the agent socket.
|
|
10
|
+
|
|
11
|
+
### Fixed
|
|
12
|
+
|
|
13
|
+
- Keep local files that a sync update would replace. When upstream starts tracking a
|
|
14
|
+
path that a checkout holds as an ignored file, such as a local `.env`, `fx sync`
|
|
15
|
+
fast-forwarded over it and replaced its contents. It now leaves that checkout as it
|
|
16
|
+
is and skips it with outcome `local_files_in_the_way`, lists the files in
|
|
17
|
+
`files_in_the_way` and holds readiness until they are moved aside. An untracked file
|
|
18
|
+
in the same position, which Git already refused to replace, is reported the same way
|
|
19
|
+
instead of as a failed `GIT_FAST_FORWARD_FAILED` row. The manifest checkout is kept
|
|
20
|
+
the same way.
|
|
21
|
+
|
|
22
|
+
## 0.14.0 (2026-10-28)
|
|
23
|
+
|
|
24
|
+
### Added
|
|
25
|
+
|
|
26
|
+
- Refresh Skills when tools change. `fx tool install` and `fx tool update` have each
|
|
27
|
+
tool they installed or updated install its Skill again for your coding agents, so
|
|
28
|
+
the agents read the instructions of the version now on PATH; each row gains
|
|
29
|
+
`skill`. `fx self update` ends by having the newly installed fx refresh the copies
|
|
30
|
+
of its own Skill that are older than it, reported as `skill_refresh`, and the new
|
|
31
|
+
`fx skill update` does that on its own: it refreshes only recognized copies older
|
|
32
|
+
than the running fx, in every agent's directory, and installs none. Keeping
|
|
33
|
+
everything current is `fx self update --yes` and `fx tool update --all`.
|
|
34
|
+
|
|
35
|
+
### Changed
|
|
36
|
+
|
|
37
|
+
- Update only installed tools with `fx tool update --all`. Outside a workspace it
|
|
38
|
+
used to take the whole catalog and install every tool not yet there; inside one it
|
|
39
|
+
installed the workspace's missing tools. It now leaves those to
|
|
40
|
+
`fx tool install --all`, and inside a workspace a `TOOLS_NOT_INSTALLED` notice names
|
|
41
|
+
them. The `FX_OUTDATED` notice no longer suggests `fx skill install`.
|
|
42
|
+
|
|
43
|
+
### Fixed
|
|
44
|
+
|
|
45
|
+
- Prefer the root `VERSION` file over dependency metadata in `fx release check`,
|
|
46
|
+
so services with a separate release version no longer show a missing or package-only
|
|
47
|
+
version. Dependency checks continue to inspect the dependency file.
|
|
48
|
+
|
|
5
49
|
## 0.13.0 (2026-10-27)
|
|
6
50
|
|
|
7
51
|
### Added
|
package/defaults/tools.yaml
CHANGED
|
@@ -63,6 +63,15 @@ tools:
|
|
|
63
63
|
desc: A local, searchable mirror of your own WeCom calendars, history included
|
|
64
64
|
install: [{ via: npm, spec: '@angelmsger/wecom-calendar-cli' }]
|
|
65
65
|
docs: https://github.com/AngelMsger/wecom-calendar-cli
|
|
66
|
+
- name: wecom-channel-cli
|
|
67
|
+
min_version: '0.1.0'
|
|
68
|
+
desc: Posts, replies and event updates in WeCom channels
|
|
69
|
+
install: [{ via: npm, spec: '@angelmsger/wecom-channel-cli' }]
|
|
70
|
+
auth:
|
|
71
|
+
command: [auth, status]
|
|
72
|
+
json: { path: data.ready, equals: true }
|
|
73
|
+
docs: https://github.com/AngelMsger/wecom-channel-cli/blob/main/docs/security.md
|
|
74
|
+
docs: https://github.com/AngelMsger/wecom-channel-cli
|
|
66
75
|
- name: gh
|
|
67
76
|
min_version: '2.50.0'
|
|
68
77
|
desc: Repositories, branches, pull requests and Actions runs on GitHub
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
const TOOL = 'wecom-channel-cli';
|
|
2
|
+
export const wecomChannelProvider = {
|
|
3
|
+
id: TOOL,
|
|
4
|
+
capability: 'channel',
|
|
5
|
+
reference: true,
|
|
6
|
+
tools: [TOOL],
|
|
7
|
+
vars: [],
|
|
8
|
+
recipes: [
|
|
9
|
+
{
|
|
10
|
+
id: 'channel-access',
|
|
11
|
+
tool: TOOL,
|
|
12
|
+
perEnv: false,
|
|
13
|
+
kind: 'manual',
|
|
14
|
+
title: 'Connect to the WeCom channel broker',
|
|
15
|
+
instructions: 'Ask the operator for the agent socket and set WECOM_CHANNEL_SOCKET or select a configured channel context.',
|
|
16
|
+
verify: {
|
|
17
|
+
command: ['auth', 'status'],
|
|
18
|
+
json: { path: 'data.ready', equals: true },
|
|
19
|
+
},
|
|
20
|
+
},
|
|
21
|
+
],
|
|
22
|
+
create: () => ({
|
|
23
|
+
label: 'Recent WeCom channel events',
|
|
24
|
+
command: [TOOL, 'event', 'list', '--limit', '10'],
|
|
25
|
+
}),
|
|
26
|
+
};
|
|
27
|
+
//# sourceMappingURL=provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/adapters/channel/wecom-channel-cli/provider.ts"],"names":[],"mappings":"AAGA,MAAM,IAAI,GAAG,mBAAmB,CAAC;AAEjC,MAAM,CAAC,MAAM,oBAAoB,GAAmC;IAClE,EAAE,EAAE,IAAI;IACR,UAAU,EAAE,SAAS;IACrB,SAAS,EAAE,IAAI;IACf,KAAK,EAAE,CAAC,IAAI,CAAC;IACb,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP;YACE,EAAE,EAAE,gBAAgB;YACpB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,qCAAqC;YAC5C,YAAY,EACV,4GAA4G;YAC9G,MAAM,EAAE;gBACN,OAAO,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;gBAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE;aAC3C;SACF;KACF;IACD,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACb,KAAK,EAAE,6BAA6B;QACpC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC;KAClD,CAAC;CACH,CAAC"}
|
|
@@ -46,23 +46,35 @@ export class SystemGit {
|
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
|
+
// Git refuses to overwrite untracked files but by default replaces ignored ones, such
|
|
50
|
+
// as a local .env the upstream starts tracking; --no-overwrite-ignore refuses both.
|
|
49
51
|
async fastForward(dir, remote, branch) {
|
|
50
52
|
const state = await this.status(dir);
|
|
51
53
|
const onBranch = state.branch === branch && !state.dirty;
|
|
52
54
|
const ref = onBranch ? 'HEAD' : branch;
|
|
53
55
|
const before = await this.revParse(dir, ref);
|
|
54
56
|
const result = onBranch
|
|
55
|
-
? await this.git([
|
|
57
|
+
? await this.git([
|
|
58
|
+
'-C',
|
|
59
|
+
dir,
|
|
60
|
+
'merge',
|
|
61
|
+
'--ff-only',
|
|
62
|
+
'--no-overwrite-ignore',
|
|
63
|
+
'--quiet',
|
|
64
|
+
`${remote}/${branch}`,
|
|
65
|
+
])
|
|
56
66
|
: await this.git(['-C', dir, 'fetch', '--quiet', remote, `${branch}:${branch}`]);
|
|
57
67
|
if (result.code !== 0) {
|
|
58
68
|
if (/not possible to fast-forward|non-fast-forward/i.test(result.stderr))
|
|
59
|
-
return 'diverged';
|
|
69
|
+
return { outcome: 'diverged' };
|
|
70
|
+
if (onBranch && FILES_IN_THE_WAY.test(result.stderr))
|
|
71
|
+
return { outcome: 'local_files_in_the_way', paths: listedPaths(result.stderr) };
|
|
60
72
|
// A ref git cannot resolve here says nothing about the remote; the remote's own
|
|
61
73
|
// branch list does.
|
|
62
74
|
const unresolved = /not something we can merge|couldn't find remote ref/i.test(result.stderr);
|
|
63
75
|
const remoteBranch = unresolved ? await this.remoteBranch(dir, remote, branch) : undefined;
|
|
64
76
|
if (remoteBranch === 'empty_remote' || remoteBranch === 'no_remote_branch')
|
|
65
|
-
return remoteBranch;
|
|
77
|
+
return { outcome: remoteBranch };
|
|
66
78
|
throw new DevkitError(gitFailureCategory(result.stderr), 'GIT_FAST_FORWARD_FAILED', `Could not update ${branch}: ${lastLine(result.stderr)}`, {
|
|
67
79
|
hint: remoteBranch === 'present'
|
|
68
80
|
? `${remote} has ${branch}, but it was not fetched here; check remote.${remote}.fetch.`
|
|
@@ -74,7 +86,7 @@ export class SystemGit {
|
|
|
74
86
|
});
|
|
75
87
|
}
|
|
76
88
|
const after = await this.revParse(dir, ref);
|
|
77
|
-
return before === after ? 'up_to_date' : 'updated';
|
|
89
|
+
return { outcome: before === after ? 'up_to_date' : 'updated' };
|
|
78
90
|
}
|
|
79
91
|
// Undefined when the remote does not list its branches in time.
|
|
80
92
|
async remoteBranch(dir, remote, branch) {
|
|
@@ -168,6 +180,14 @@ export class SystemGit {
|
|
|
168
180
|
return runGit(this.process, args, options);
|
|
169
181
|
}
|
|
170
182
|
}
|
|
183
|
+
// Git lists the files it would have replaced, one per tab-indented line, and moves nothing.
|
|
184
|
+
const FILES_IN_THE_WAY = /untracked working tree files would be (?:overwritten|removed) by merge|would lose untracked files/i;
|
|
185
|
+
// Git lists each path raw after one tab. Only that tab is dropped: spaces at either end
|
|
186
|
+
// belong to the file name, and files_in_the_way must name the exact files to move.
|
|
187
|
+
function listedPaths(stderr) {
|
|
188
|
+
const listed = stderr.split(/\r?\n/).filter((line) => line.startsWith('\t'));
|
|
189
|
+
return [...new Set(listed.map((line) => line.slice(1)).filter((line) => line.length > 0))];
|
|
190
|
+
}
|
|
171
191
|
function gitFailureCategory(stderr) {
|
|
172
192
|
if (/remote branch .*not found|couldn't find remote ref|not something we can merge|repository .* does not exist/i.test(stderr))
|
|
173
193
|
return 'not_found';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-git.js","sourceRoot":"","sources":["../../../src/adapters/git/system-git.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"system-git.js","sourceRoot":"","sources":["../../../src/adapters/git/system-git.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { DevkitError } from '../../domain/errors.js';
|
|
4
4
|
import { messageOf } from '../../domain/values.js';
|
|
5
|
+
import { filesInTheWayReason } from '../../domain/workspace/state.js';
|
|
5
6
|
import { lastLine, runGit } from '../git/run.js';
|
|
6
7
|
import { PAYLOAD_PATHS } from './payload.js';
|
|
7
8
|
export class GitRepoSource {
|
|
@@ -142,19 +143,21 @@ export class GitRepoSource {
|
|
|
142
143
|
const protection = await this.worktreeProtection(dir, state);
|
|
143
144
|
if (protection !== undefined)
|
|
144
145
|
return kept(protection + (await this.landed(dir, state, branch)));
|
|
145
|
-
const
|
|
146
|
-
if (outcome === 'diverged') {
|
|
146
|
+
const forwarded = await this.git.fastForward(dir, 'upstream', branch);
|
|
147
|
+
if (forwarded.outcome === 'diverged') {
|
|
147
148
|
const suffix = onBranch ? '' : '; its ref was not moved';
|
|
148
149
|
return kept(`local commits on ${branch} diverge from upstream${suffix}`);
|
|
149
150
|
}
|
|
150
|
-
if (outcome === 'empty_remote')
|
|
151
|
+
if (forwarded.outcome === 'empty_remote')
|
|
151
152
|
return kept('upstream has no branches yet');
|
|
152
|
-
if (outcome === 'no_remote_branch')
|
|
153
|
+
if (forwarded.outcome === 'no_remote_branch')
|
|
153
154
|
return kept(`upstream has no ${branch} branch`);
|
|
155
|
+
if (forwarded.outcome === 'local_files_in_the_way')
|
|
156
|
+
return kept(filesInTheWayReason(forwarded.paths));
|
|
154
157
|
if (!onBranch)
|
|
155
158
|
return kept(`on ${state.branch ?? 'a detached HEAD'}, not ${branch}; only the ${branch} ref moved` +
|
|
156
159
|
(await this.landed(dir, state, branch)));
|
|
157
|
-
return { result: outcome };
|
|
160
|
+
return { result: forwarded.outcome };
|
|
158
161
|
}
|
|
159
162
|
// Whether the commits of a checkout kept on another branch already reached upstream,
|
|
160
163
|
// so the person knows returning to the default branch loses nothing committed.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-repo.js","sourceRoot":"","sources":["../../../src/adapters/manifest-source/git-repo.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAEhF,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"git-repo.js","sourceRoot":"","sources":["../../../src/adapters/manifest-source/git-repo.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAEhF,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAkB,MAAM,iCAAiC,CAAC;AAStF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,OAAO,aAAa;IAIL;IACA;IACA;IACA;IACA;IAPV,IAAI,GAAG,MAAM,CAAC;IAEvB,YACmB,GAAW,EACX,OAAgB,EAChB,GAAQ,EACR,cAAuB,EACvB,EAAe;QAJf,QAAG,GAAH,GAAG,CAAQ;QACX,YAAO,GAAP,OAAO,CAAS;QAChB,QAAG,GAAH,GAAG,CAAK;QACR,mBAAc,GAAd,cAAc,CAAS;QACvB,OAAE,GAAF,EAAE,CAAa;IAC/B,CAAC;IAEJ,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,UAAmB;QAC/B,IAAI,UAAU,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,cAAc,KAAK,SAAS;YACtC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,GAAW;QACtC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,IAAI,MAAM,CAAC;QACtE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,KAAK,SAAS;YACtF,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7C,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE;YAC1C,IAAI;YACJ,IAAI,CAAC,cAAc;YACnB,YAAY;YACZ,eAAe;YACf,IAAI;YACJ,MAAM;SACP,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,GAAW,EAAE,KAAgB;QAC5D,IAAI,KAAK,CAAC,KAAK;YAAE,OAAO,0BAA0B,KAAK,CAAC,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACtF,IAAI,KAAK,CAAC,SAAS,GAAG,CAAC;YAAE,OAAO,wCAAwC,CAAC;QACzE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC7C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,oBAAoB,CAAC,CAAC;YAC/E,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE;gBACnB,IAAI;gBACJ,GAAG;gBACH,UAAU;gBACV,UAAU;gBACV,WAAW;gBACX,oBAAoB;gBACpB,IAAI;gBACJ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/D,CAAC;SACH,CAAC,CAAC;QACH,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;YAC5C,OAAO,kFAAkF,CAAC;QAC5F,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,wCAAwC,CAAC;QACjF,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;YAC3B,OAAO,2FAA2F,CAAC;QACrG,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,eAAe,CAAC,GAAW;QACjC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,KAAK,SAAS;YACrB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;IACjG,CAAC;IAEO,aAAa,CAAC,GAAW,EAAE,GAAW;QAC5C,OAAO;YACL,IAAI,EAAE,GAAG,GAAG,IAAI,GAAG,EAAE;YACrB,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;gBACjF,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;oBAAE,OAAO,MAAM,CAAC,MAAM,CAAC;gBAC5C,IAAI,IAAI,KAAK,yBAAyB;oBAAE,OAAO,SAAS,CAAC;gBACzD,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,yBAAyB,EACzB,2DAA2D,EAC3D;oBACE,SAAS,EAAE;wBACT,8EAA8E;qBAC/E;iBACF,CACF,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAAW;QAC3B,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG;gBAClC,MAAM,IAAI,WAAW,CACnB,UAAU,EACV,iBAAiB,EACjB,qDAAqD,EACrD,EAAE,SAAS,EAAE,CAAC,uDAAuD,CAAC,EAAE,CACzE,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE;YACxC,OAAO;YACP,SAAS;YACT,UAAU;YACV,UAAU;YACV,IAAI,CAAC,GAAG;YACR,GAAG;SACJ,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,WAAW,CACnB,SAAS,EACT,uBAAuB,EACvB,mBAAmB,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EACzD;gBACE,IAAI,EAAE,mFAAmF;gBACzF,SAAS,EAAE,CAAC,aAAa,IAAI,CAAC,GAAG,EAAE,CAAC;aACrC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW;QACvB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,WAAW,CACnB,SAAS,EACT,yBAAyB,EACzB,gDAAgD,GAAG,KAAK,SAAS,CAAC,GAAG,CAAC,EAAE,EACxE;gBACE,IAAI,EAAE,sEAAsE;gBAC5E,SAAS,EAAE,CAAC,UAAU,GAAG,iBAAiB,CAAC;aAC5C,CACF,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,IAAI,MAAM,CAAC;QACtE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,CAAC,MAAc,EAAkB,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7D,IAAI,UAAU,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAChG,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QACtE,IAAI,SAAS,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC;YACzD,OAAO,IAAI,CAAC,oBAAoB,MAAM,yBAAyB,MAAM,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,SAAS,CAAC,OAAO,KAAK,cAAc;YAAE,OAAO,IAAI,CAAC,8BAA8B,CAAC,CAAC;QACtF,IAAI,SAAS,CAAC,OAAO,KAAK,kBAAkB;YAAE,OAAO,IAAI,CAAC,mBAAmB,MAAM,SAAS,CAAC,CAAC;QAC9F,IAAI,SAAS,CAAC,OAAO,KAAK,wBAAwB;YAChD,OAAO,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ;YACX,OAAO,IAAI,CACT,MAAM,KAAK,CAAC,MAAM,IAAI,iBAAiB,SAAS,MAAM,cAAc,MAAM,YAAY;gBACpF,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAC1C,CAAC;QACJ,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC;IAED,qFAAqF;IACrF,+EAA+E;IACvE,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,KAAgB,EAAE,MAAc;QAChE,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,YAAY,MAAM,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE;YACxC,IAAI;YACJ,GAAG;YACH,YAAY;YACZ,eAAe;YACf,MAAM;YACN,MAAM;SACP,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,gCAAgC,MAAM,EAAE,CAAC;QACvE,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC;YAChC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,SAAS,CAAC;SACtC,CAAC,CAAC;QACH,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1F,CAAC;CACF"}
|
|
@@ -10,7 +10,7 @@ import { CHECK_TIMEOUT_MS, commandVerdict } from '../login/verify.js';
|
|
|
10
10
|
import { assertWritable } from '../safety/posture.js';
|
|
11
11
|
import { applyCopies, planCopies } from '../skill/fx-copies.js';
|
|
12
12
|
import { skillTargets } from '../skill/targets.js';
|
|
13
|
-
import {
|
|
13
|
+
import { planToolSkills, runTools, toolSkillOutcome, } from '../skill/tool-skills.js';
|
|
14
14
|
import { skillChecks } from '../sync/checks.js';
|
|
15
15
|
import { ToolCheck } from '../tool/check.js';
|
|
16
16
|
import { selectTools } from '../tool/select.js';
|
|
@@ -133,16 +133,13 @@ export class StandaloneInit {
|
|
|
133
133
|
// Skill of a tool it has yet to install.
|
|
134
134
|
async skills(selected, onPath, installs, input) {
|
|
135
135
|
const failed = new Set(installs.filter((item) => item.status === 'failed').map((i) => i.name));
|
|
136
|
-
const toolchain = selected
|
|
137
|
-
.filter((tool) => (input.dryRun ? !failed.has(tool.name) : onPath.includes(tool)))
|
|
138
|
-
.map((tool) => ({ ...tool, installOnInit: true }));
|
|
139
136
|
const status = input.dryRun ? 'planned' : 'not_started';
|
|
140
137
|
const fx = (await planCopies(this.deps, this.deps.skills, undefined)).map((item) => ({ ...item, status }));
|
|
141
|
-
const tools =
|
|
142
|
-
|
|
138
|
+
const tools = await planToolSkills(this.deps, this.deps.skills, {
|
|
139
|
+
tools: selected.filter((tool) => input.dryRun ? !failed.has(tool.name) : onPath.includes(tool)),
|
|
143
140
|
dryRun: input.dryRun,
|
|
144
141
|
posture: input.posture,
|
|
145
|
-
})
|
|
142
|
+
});
|
|
146
143
|
if (input.dryRun)
|
|
147
144
|
return { fx, tools };
|
|
148
145
|
try {
|
|
@@ -248,13 +245,12 @@ function status(statuses, tool) {
|
|
|
248
245
|
}
|
|
249
246
|
function row(tool, current, installs, skills, signIn) {
|
|
250
247
|
const installed = installs.find((item) => item.name === tool.name);
|
|
251
|
-
const own = skills.filter((item) => item.tool === tool.name && item.vector !== null);
|
|
252
248
|
return {
|
|
253
249
|
name: tool.name,
|
|
254
250
|
state: current.state,
|
|
255
251
|
installed: current.installed,
|
|
256
252
|
install: installOutcome(installed),
|
|
257
|
-
skill:
|
|
253
|
+
skill: toolSkillOutcome(skills, tool.name),
|
|
258
254
|
sign_in: signIn?.state ?? 'unknown',
|
|
259
255
|
setup: tool.auth?.login === undefined ? null : [tool.binary, ...tool.auth.login],
|
|
260
256
|
};
|
|
@@ -268,15 +264,6 @@ function installOutcome(installed) {
|
|
|
268
264
|
return 'failed';
|
|
269
265
|
return installed.ran ? 'installed' : 'manual';
|
|
270
266
|
}
|
|
271
|
-
function skillOutcome(own, installed) {
|
|
272
|
-
if (own.length === 0)
|
|
273
|
-
return 'none';
|
|
274
|
-
if (own.some((item) => item.status === 'failed' || item.failure !== undefined))
|
|
275
|
-
return 'failed';
|
|
276
|
-
if (own.every((item) => item.status === 'planned') || installed?.status === 'planned')
|
|
277
|
-
return 'planned';
|
|
278
|
-
return 'installed';
|
|
279
|
-
}
|
|
280
267
|
// A tool that is not on PATH has nothing to sign in to yet; its installation is the blocker.
|
|
281
268
|
function toolChecks(item, context) {
|
|
282
269
|
const { signIn, cwd } = context;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standalone.js","sourceRoot":"","sources":["../../../src/application/init/standalone.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"standalone.js","sourceRoot":"","sources":["../../../src/application/init/standalone.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { asDevkitError } from '../../domain/errors.js';
|
|
7
7
|
import { DEPENDENCY_FILES } from '../../domain/release/deps.js';
|
|
8
8
|
import { attributed, peopleCommits, unmergedOf } from '../../domain/release/merge.js';
|
|
9
|
-
import { declaredVersion, GRADLE_PROPERTIES, VERSION_READERS, } from '../../domain/release/version.js';
|
|
9
|
+
import { declaredVersion, GRADLE_PROPERTIES, ROOT_VERSION, VERSION_READERS, } from '../../domain/release/version.js';
|
|
10
10
|
export async function describeRepo(ctx, outcome) {
|
|
11
11
|
const blank = {
|
|
12
12
|
name: ctx.repo.name,
|
|
@@ -82,8 +82,10 @@ async function headOf(asked, facts, branch, side, file) {
|
|
|
82
82
|
version: version ?? null,
|
|
83
83
|
};
|
|
84
84
|
}
|
|
85
|
-
//
|
|
85
|
+
// Prefer the explicit root VERSION file, then the dependency file the deps check reads.
|
|
86
86
|
async function versionFileAt(facts, sha) {
|
|
87
|
+
if ((await facts.host.readFile(facts.ref, ROOT_VERSION, sha)) !== undefined)
|
|
88
|
+
return ROOT_VERSION;
|
|
87
89
|
for (const { file } of DEPENDENCY_FILES) {
|
|
88
90
|
const text = await facts.host.readFile(facts.ref, file, sha);
|
|
89
91
|
if (text !== undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo.js","sourceRoot":"","sources":["../../../src/application/release/repo.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"repo.js","sourceRoot":"","sources":["../../../src/application/release/repo.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
// Update fx through its distribution registry after confirmation and the write gate.
|
|
2
2
|
// Capture installer output so machine-readable results remain valid on stdout. A
|
|
3
|
-
// completed install settles the update-check window on the version it installed
|
|
3
|
+
// completed install settles the update-check window on the version it installed, then
|
|
4
|
+
// has the installed fx refresh the copies of its Skill that are now older than it: only
|
|
5
|
+
// the new installation knows its own Skill and version.
|
|
4
6
|
import { DevkitError } from '../../domain/errors.js';
|
|
5
7
|
import { stderrReason } from '../../domain/toolchain/stderr.js';
|
|
6
8
|
import { assertWritable } from '../safety/posture.js';
|
|
@@ -14,6 +16,44 @@ export class SelfUpdate {
|
|
|
14
16
|
this.deps = deps;
|
|
15
17
|
}
|
|
16
18
|
async execute(input) {
|
|
19
|
+
const vector = this.plan(input);
|
|
20
|
+
const unrun = (reason) => ({
|
|
21
|
+
vector,
|
|
22
|
+
ran: false,
|
|
23
|
+
code: null,
|
|
24
|
+
reason,
|
|
25
|
+
skill_refresh: this.unrefreshed(input.posture, reason),
|
|
26
|
+
});
|
|
27
|
+
if (input.dryRun)
|
|
28
|
+
return unrun('dry run');
|
|
29
|
+
assertWritable(input.posture, 'self update');
|
|
30
|
+
await this.assertInstaller();
|
|
31
|
+
if (!input.yes) {
|
|
32
|
+
const go = await this.deps.prompter.confirm(`Run \`${vector.join(' ')}\`?`, {
|
|
33
|
+
defaultYes: true,
|
|
34
|
+
});
|
|
35
|
+
if (!go)
|
|
36
|
+
return unrun('declined');
|
|
37
|
+
}
|
|
38
|
+
const result = await this.deps.process.run(vector, { interactive: false });
|
|
39
|
+
if (result.code !== 0)
|
|
40
|
+
return {
|
|
41
|
+
vector,
|
|
42
|
+
ran: true,
|
|
43
|
+
code: result.code,
|
|
44
|
+
reason: stderrReason(result.stderr, result.code),
|
|
45
|
+
skill_refresh: this.unrefreshed(input.posture, 'fx was not updated'),
|
|
46
|
+
};
|
|
47
|
+
await this.settleCheck(input);
|
|
48
|
+
return {
|
|
49
|
+
vector,
|
|
50
|
+
ran: true,
|
|
51
|
+
code: 0,
|
|
52
|
+
reason: null,
|
|
53
|
+
skill_refresh: await this.refreshSkill(input.posture),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
plan(input) {
|
|
17
57
|
if (input.registry === null) {
|
|
18
58
|
throw new DevkitError('config', 'REGISTRY_UNKNOWN', 'No valid update registry is configured', {
|
|
19
59
|
hint: 'Check npm registry configuration and any FX_REGISTRY override; follow the registry setup handoff.',
|
|
@@ -30,37 +70,44 @@ export class SelfUpdate {
|
|
|
30
70
|
throw new DevkitError('config', 'REGISTRY_UNKNOWN', 'The installer cannot plan this update', {
|
|
31
71
|
nextSteps: ['fx self info', `Update ${input.packageName} with your package manager.`],
|
|
32
72
|
});
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
if (
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
73
|
+
return vector;
|
|
74
|
+
}
|
|
75
|
+
async assertInstaller() {
|
|
76
|
+
if (await this.deps.installer.available())
|
|
77
|
+
return;
|
|
78
|
+
throw new DevkitError('config', 'TOOL_MISSING', 'The self-update installer is unavailable', {
|
|
79
|
+
nextSteps: ['Install npm or add it to PATH, then retry.'],
|
|
80
|
+
handoff: {
|
|
81
|
+
summary: 'The package installer is missing.',
|
|
82
|
+
command: 'fx self info --format json',
|
|
83
|
+
userSteps: [
|
|
84
|
+
{ id: 'self-installer', kind: 'manual', title: 'Install npm or add it to PATH.' },
|
|
85
|
+
],
|
|
86
|
+
},
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
// The refresh is an invocation of its own and resolves its posture again, so the explicit
|
|
90
|
+
// --allow-writes that let this one write goes with it; nothing weaker does.
|
|
91
|
+
refreshVector(posture) {
|
|
92
|
+
const refresh = this.deps.skillRefresh;
|
|
93
|
+
return posture.source === 'flag' ? [...refresh, '--allow-writes'] : refresh;
|
|
94
|
+
}
|
|
95
|
+
unrefreshed(posture, reason) {
|
|
96
|
+
const vector = this.refreshVector(posture);
|
|
97
|
+
return { vector, ran: false, code: null, refreshed: null, reason };
|
|
98
|
+
}
|
|
99
|
+
async refreshSkill(posture) {
|
|
100
|
+
const vector = this.refreshVector(posture);
|
|
101
|
+
const result = await this.deps.process.run(vector, {
|
|
102
|
+
diagnostic: { phase: 'fx skill update' },
|
|
103
|
+
});
|
|
104
|
+
return {
|
|
56
105
|
vector,
|
|
57
106
|
ran: true,
|
|
58
107
|
code: result.code,
|
|
108
|
+
refreshed: result.code === 0 ? refreshedCopies(result.stdout) : null,
|
|
59
109
|
reason: result.code === 0 ? null : stderrReason(result.stderr, result.code),
|
|
60
110
|
};
|
|
61
|
-
if (isUpdated(output))
|
|
62
|
-
await this.settleCheck(input);
|
|
63
|
-
return output;
|
|
64
111
|
}
|
|
65
112
|
async settleCheck(input) {
|
|
66
113
|
const { latest } = await this.deps.check.execute(input);
|
|
@@ -68,4 +115,14 @@ export class SelfUpdate {
|
|
|
68
115
|
await this.deps.check.markCurrent(input, latest);
|
|
69
116
|
}
|
|
70
117
|
}
|
|
118
|
+
// `skill update --format json` lists each copy it considered; a refreshed one now says installed.
|
|
119
|
+
function refreshedCopies(stdout) {
|
|
120
|
+
try {
|
|
121
|
+
const { items } = JSON.parse(stdout);
|
|
122
|
+
return Array.isArray(items) ? items.filter((item) => item.status === 'installed').length : null;
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
71
128
|
//# sourceMappingURL=update.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/application/self/update.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,iFAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/application/self/update.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,iFAAiF;AACjF,sFAAsF;AACtF,wFAAwF;AACxF,wDAAwD;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAIhE,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AA4BjD,MAAM,UAAU,SAAS,CAAC,MAAwB;IAChD,OAAO,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC;AACzC,CAAC;AAWD,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAoB;QAApB,SAAI,GAAJ,IAAI,CAAgB;IAAG,CAAC;IAErD,KAAK,CAAC,OAAO,CAAC,KAAsB;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,CAAC,MAAc,EAAoB,EAAE,CAAC,CAAC;YACnD,MAAM;YACN,GAAG,EAAE,KAAK;YACV,IAAI,EAAE,IAAI;YACV,MAAM;YACN,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;SACvD,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC;QAC1C,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACf,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;gBAC1E,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,EAAE;gBAAE,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3E,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;YACnB,OAAO;gBACL,MAAM;gBACN,GAAG,EAAE,IAAI;gBACT,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;gBAChD,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,oBAAoB,CAAC;aACrE,CAAC;QACJ,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO;YACL,MAAM;YACN,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;SACtD,CAAC;IACJ,CAAC;IAEO,IAAI,CAAC,KAAsB;QACjC,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC5B,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,kBAAkB,EAClB,wCAAwC,EACxC;gBACE,IAAI,EAAE,mGAAmG;gBACzG,SAAS,EAAE,CAAC,cAAc,CAAC;gBAC3B,OAAO,EAAE,gBAAgB;aAC1B,CACF,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE;YAC3D,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,SAAS;SACzB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM;YACT,MAAM,IAAI,WAAW,CAAC,QAAQ,EAAE,kBAAkB,EAAE,uCAAuC,EAAE;gBAC3F,SAAS,EAAE,CAAC,cAAc,EAAE,UAAU,KAAK,CAAC,WAAW,6BAA6B,CAAC;aACtF,CAAC,CAAC;QACL,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;YAAE,OAAO;QAClD,MAAM,IAAI,WAAW,CAAC,QAAQ,EAAE,cAAc,EAAE,0CAA0C,EAAE;YAC1F,SAAS,EAAE,CAAC,4CAA4C,CAAC;YACzD,OAAO,EAAE;gBACP,OAAO,EAAE,mCAAmC;gBAC5C,OAAO,EAAE,4BAA4B;gBACrC,SAAS,EAAE;oBACT,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,gCAAgC,EAAE;iBAClF;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,0FAA0F;IAC1F,4EAA4E;IACpE,aAAa,CAAC,OAAqB;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;QACvC,OAAO,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9E,CAAC;IAEO,WAAW,CAAC,OAAqB,EAAE,MAAc;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrE,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,OAAqB;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;YACjD,UAAU,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE;SACzC,CAAC,CAAC;QACH,OAAO;YACL,MAAM;YACN,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,SAAS,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;YACpE,MAAM,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;SAC5E,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,KAAsB;QAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxD,IAAI,MAAM,KAAK,IAAI;YAAE,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;CACF;AAED,kGAAkG;AAClG,SAAS,eAAe,CAAC,MAAc;IACrC,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAA+C,CAAC;QACnF,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAClG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|