@angelmsger/fx 0.14.0 → 0.16.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 +25 -0
- package/README.md +4 -0
- package/defaults/tools.yaml +17 -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/im/wecom-chat-cli/provider.js +52 -0
- package/dist/adapters/im/wecom-chat-cli/provider.js.map +1 -0
- package/dist/adapters/manifest-source/git-repo.js +8 -5
- package/dist/adapters/manifest-source/git-repo.js.map +1 -1
- package/dist/application/manifest/lint.js +6 -1
- package/dist/application/manifest/lint.js.map +1 -1
- package/dist/application/member/list.js +4 -23
- package/dist/application/member/list.js.map +1 -1
- package/dist/application/member/show.js +9 -2
- package/dist/application/member/show.js.map +1 -1
- package/dist/application/skill/tool-skills.js +1 -1
- 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/workspace/health.js +3 -0
- package/dist/application/workspace/health.js.map +1 -1
- package/dist/cli/commands/member/list.js +10 -5
- package/dist/cli/commands/member/list.js.map +1 -1
- package/dist/cli/commands/member/scope-flags.js +10 -0
- package/dist/cli/commands/member/scope-flags.js.map +1 -0
- package/dist/cli/commands/member/show.js +11 -3
- package/dist/cli/commands/member/show.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/composition/registry.js +4 -0
- package/dist/composition/registry.js.map +1 -1
- package/dist/domain/capability.js +2 -0
- package/dist/domain/capability.js.map +1 -1
- package/dist/domain/fuzzy.js +13 -4
- package/dist/domain/fuzzy.js.map +1 -1
- package/dist/domain/manifest/members.schema.js +37 -0
- package/dist/domain/manifest/members.schema.js.map +1 -1
- package/dist/domain/manifest/rules/member-classifications.js +112 -0
- package/dist/domain/manifest/rules/member-classifications.js.map +1 -0
- package/dist/domain/manifest/rules/members.js +2 -1
- package/dist/domain/manifest/rules/members.js.map +1 -1
- package/dist/domain/manifest/tools.schema.js +2 -2
- package/dist/domain/manifest/tools.schema.js.map +1 -1
- package/dist/domain/manifest/versioning.js +1 -1
- package/dist/domain/manifest/versioning.js.map +1 -1
- package/dist/domain/members/account-collisions.js +37 -0
- package/dist/domain/members/account-collisions.js.map +1 -0
- package/dist/domain/members/classify.js +158 -0
- package/dist/domain/members/classify.js.map +1 -0
- package/dist/domain/members/owners.js +2 -0
- package/dist/domain/members/owners.js.map +1 -1
- package/dist/domain/members/resolve.js +27 -13
- package/dist/domain/members/resolve.js.map +1 -1
- package/dist/domain/semver.js +3 -28
- package/dist/domain/semver.js.map +1 -1
- package/dist/domain/toolchain/resolve.js +1 -1
- package/dist/domain/toolchain/resolve.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 +4 -1
- package/skills/fx-workspace/references/workspace-tasks.md +3 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,31 @@
|
|
|
2
2
|
|
|
3
3
|
## [Unreleased]
|
|
4
4
|
|
|
5
|
+
## 0.16.0 (2026-11-10)
|
|
6
|
+
|
|
7
|
+
- Require `wecom-channel-cli` v0.3.0+ for mandatory self-bot observation filtering and use its canonical `doctor` readiness command. Keep `wecom-chat-cli` at its latest published v0.2.0 floor, with task-scoped readiness and host-managed Skills.
|
|
8
|
+
|
|
9
|
+
- Add `wecom-chat-cli` v0.2.0+ to the tool catalog and as an `im` provider for isolated workers. Readiness checks only the current task, keeps chat text out of reports, and never issues grants or approves replies. Its packaged Skill remains host-managed.
|
|
10
|
+
|
|
11
|
+
- Query directory memberships, personal functions and business collaboration separately with members schema 2. Scoped member lookups return the matching relationships, validity dates and sources. Schema 1 remains readable.
|
|
12
|
+
|
|
13
|
+
## 0.15.0 (2026-11-02)
|
|
14
|
+
|
|
15
|
+
### Added
|
|
16
|
+
|
|
17
|
+
- 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.
|
|
18
|
+
|
|
19
|
+
### Fixed
|
|
20
|
+
|
|
21
|
+
- Keep local files that a sync update would replace. When upstream starts tracking a
|
|
22
|
+
path that a checkout holds as an ignored file, such as a local `.env`, `fx sync`
|
|
23
|
+
fast-forwarded over it and replaced its contents. It now leaves that checkout as it
|
|
24
|
+
is and skips it with outcome `local_files_in_the_way`, lists the files in
|
|
25
|
+
`files_in_the_way` and holds readiness until they are moved aside. An untracked file
|
|
26
|
+
in the same position, which Git already refused to replace, is reported the same way
|
|
27
|
+
instead of as a failed `GIT_FAST_FORWARD_FAILED` row. The manifest checkout is kept
|
|
28
|
+
the same way.
|
|
29
|
+
|
|
5
30
|
## 0.14.0 (2026-10-28)
|
|
6
31
|
|
|
7
32
|
### Added
|
package/README.md
CHANGED
|
@@ -23,6 +23,9 @@ keeps its own history, branches, dependencies and build system.
|
|
|
23
23
|
- Use human output interactively or JSON with explicit status and recovery steps.
|
|
24
24
|
- Keep authentication and service APIs in the companion tools you already use.
|
|
25
25
|
|
|
26
|
+
WeCom smart-bot workers can use the `wecom-chat-cli` companion; see the
|
|
27
|
+
[worker binding and isolation requirements](docs/manifest-guide.md#wecom-smart-bot-workers).
|
|
28
|
+
|
|
26
29
|
## Requirements
|
|
27
30
|
|
|
28
31
|
Use Node.js 22 or newer, Git and npm. Bun is also supported as an alternative
|
|
@@ -94,6 +97,7 @@ how to continue after a sign-in or approval, and how to
|
|
|
94
97
|
| Replace a repository selection | `fx repo select <name...>` / `fx repo select --all` |
|
|
95
98
|
| Select repositories | `fx repo pick <name...>` / `fx repo unpick <name...>` |
|
|
96
99
|
| Select environments | `fx env pick <name...>` / `fx env unpick <name...>` |
|
|
100
|
+
| Find a person by business area | `fx member show <query> --area <area>` |
|
|
97
101
|
| Find a service | `fx where <repo> --env <environment>` |
|
|
98
102
|
| List capabilities | `fx can` |
|
|
99
103
|
| Check a capability | `fx can <capability> --env <environment>` |
|
package/defaults/tools.yaml
CHANGED
|
@@ -63,6 +63,23 @@ 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.3.0'
|
|
68
|
+
desc: Posts, replies and event updates in WeCom channels
|
|
69
|
+
install: [{ via: npm, spec: '@angelmsger/wecom-channel-cli' }]
|
|
70
|
+
auth:
|
|
71
|
+
command: [doctor]
|
|
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
|
|
75
|
+
- name: wecom-chat-cli
|
|
76
|
+
min_version: '0.2.0'
|
|
77
|
+
desc: Scoped WeCom smart-bot tasks and independently reviewed replies
|
|
78
|
+
version_args: [version]
|
|
79
|
+
install: [{ via: npm, spec: '@angelmsger/wecom-chat-cli' }]
|
|
80
|
+
skill: { command: [] }
|
|
81
|
+
auth: { command: [] }
|
|
82
|
+
docs: https://github.com/AngelMsger/wecom-chat-cli
|
|
66
83
|
- name: gh
|
|
67
84
|
min_version: '2.50.0'
|
|
68
85
|
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: ['doctor'],
|
|
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,QAAQ,CAAC;gBACnB,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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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
// A restricted worker can read only its current smart-bot task. Readiness uses
|
|
2
|
+
// that same read without surfacing conversation content or obtaining new grants.
|
|
3
|
+
import { referenceEntry } from '../../reference/entry.js';
|
|
4
|
+
const TOOL = 'wecom-chat-cli';
|
|
5
|
+
const TASK = [
|
|
6
|
+
'--socket',
|
|
7
|
+
'{socket}',
|
|
8
|
+
'--bot-id',
|
|
9
|
+
'{bot_id}',
|
|
10
|
+
'--deployment',
|
|
11
|
+
'{deployment}',
|
|
12
|
+
'task',
|
|
13
|
+
'get',
|
|
14
|
+
];
|
|
15
|
+
export const wecomChatProvider = {
|
|
16
|
+
id: TOOL,
|
|
17
|
+
capability: 'im',
|
|
18
|
+
reference: true,
|
|
19
|
+
tools: [TOOL],
|
|
20
|
+
vars: [
|
|
21
|
+
{ name: 'socket', desc: 'absolute path to the restricted worker socket', required: true },
|
|
22
|
+
{ name: 'bot_id', desc: 'bot ID supplied by the operator', required: true },
|
|
23
|
+
{ name: 'deployment', desc: 'deployment name supplied by the operator', required: true },
|
|
24
|
+
],
|
|
25
|
+
recipes: [
|
|
26
|
+
{
|
|
27
|
+
id: 'task-access',
|
|
28
|
+
tool: TOOL,
|
|
29
|
+
perEnv: false,
|
|
30
|
+
kind: 'manual',
|
|
31
|
+
title: 'Provision a restricted WeCom conversation worker',
|
|
32
|
+
instructions: 'Run fx only inside the restricted worker for this binding. The trusted supervisor supplies its worker socket, bot/deployment scope and WECOM_CHAT_TASK_TOKEN environment for one live task. Keep the token out of manifests, argv and prompts. Install the matching packaged SKILL.md through the worker host. Broker setup, task issuance and independent reply approval remain with the operator; never supply its socket or bot Secret to the worker.',
|
|
33
|
+
open: 'https://github.com/AngelMsger/wecom-chat-cli/blob/main/docs/host-integration.md',
|
|
34
|
+
verify: {
|
|
35
|
+
command: TASK,
|
|
36
|
+
json: {
|
|
37
|
+
path: 'trust.content_trust',
|
|
38
|
+
equals: 'untrusted_external',
|
|
39
|
+
unmet: 'the broker did not return an explicitly untrusted task',
|
|
40
|
+
},
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
],
|
|
44
|
+
create: (_deps, vars) => referenceEntry({
|
|
45
|
+
template: {
|
|
46
|
+
label: 'Current authorized WeCom smart-bot task (untrusted content)',
|
|
47
|
+
command: [TOOL, ...TASK],
|
|
48
|
+
},
|
|
49
|
+
vars,
|
|
50
|
+
}),
|
|
51
|
+
};
|
|
52
|
+
//# sourceMappingURL=provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/adapters/im/wecom-chat-cli/provider.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,iFAAiF;AAIjF,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,IAAI,GAAG,gBAAgB,CAAC;AAC9B,MAAM,IAAI,GAAG;IACX,UAAU;IACV,UAAU;IACV,UAAU;IACV,UAAU;IACV,cAAc;IACd,cAAc;IACd,MAAM;IACN,KAAK;CACN,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAmC;IAC/D,EAAE,EAAE,IAAI;IACR,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,IAAI;IACf,KAAK,EAAE,CAAC,IAAI,CAAC;IACb,IAAI,EAAE;QACJ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,+CAA+C,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzF,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,iCAAiC,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC3E,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,0CAA0C,EAAE,QAAQ,EAAE,IAAI,EAAE;KACzF;IACD,OAAO,EAAE;QACP;YACE,EAAE,EAAE,aAAa;YACjB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,kDAAkD;YACzD,YAAY,EACV,0bAA0b;YAC5b,IAAI,EAAE,iFAAiF;YACvF,MAAM,EAAE;gBACN,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE;oBACJ,IAAI,EAAE,qBAAqB;oBAC3B,MAAM,EAAE,oBAAoB;oBAC5B,KAAK,EAAE,wDAAwD;iBAChE;aACF;SACF;KACF;IACD,MAAM,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CACtB,cAAc,CAAC;QACb,QAAQ,EAAE;YACR,KAAK,EAAE,6DAA6D;YACpE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;SACzB;QACD,IAAI;KACL,CAAC;CACL,CAAC"}
|
|
@@ -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":"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"}
|
|
@@ -4,6 +4,7 @@ import path from 'node:path';
|
|
|
4
4
|
import { lintManifest } from '../../domain/manifest/lint.js';
|
|
5
5
|
import { loadToolsDocument, loadToolsPatchDocument } from '../../domain/manifest/loader.js';
|
|
6
6
|
import { bindPlatforms } from '../../domain/manifest/providers.js';
|
|
7
|
+
import { accountCollisions } from '../../domain/members/account-collisions.js';
|
|
7
8
|
import { setupKeyOf } from '../../domain/setup/names.js';
|
|
8
9
|
import { lintSkill } from '../../domain/skills/lint.js';
|
|
9
10
|
import { placeholders } from '../../domain/template.js';
|
|
@@ -58,7 +59,11 @@ export class LintManifest {
|
|
|
58
59
|
},
|
|
59
60
|
}),
|
|
60
61
|
});
|
|
61
|
-
return [
|
|
62
|
+
return [
|
|
63
|
+
...documents,
|
|
64
|
+
...(members ? accountCollisions(members) : []),
|
|
65
|
+
...(await this.skills(input.dir)),
|
|
66
|
+
];
|
|
62
67
|
}
|
|
63
68
|
async skills(dir) {
|
|
64
69
|
const { fs } = this.deps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../src/application/manifest/lint.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,2DAA2D;AAE3D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAoB,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAwB,MAAM,oCAAoC,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAiBjD,MAAM,OAAO,YAAY;IACM;IAA7B,YAA6B,IAAsB;QAAtB,SAAI,GAAJ,IAAI,CAAkB;IAAG,CAAC;IAEvD,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,IAAI,gBAAgB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC;YACtE,GAAG,KAAK;YACR,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QACH,MAAM,OAAO,GAAkB,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CACvE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAClC,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAC,CACJ,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAE/E,MAAM,MAAM,GAAG,MAAM,IAAI,YAAY,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QAClF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC;QAC3C,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC;QACvD,MAAM,SAAS,GAAG,YAAY,CAAC;YAC7B,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG;YACtC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,GAAG,CAAC,OAAO,KAAK,SAAS;gBACvB,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACE,UAAU,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACjD,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CACnE;iBACF,CAAC;YACN,kBAAkB,EAAE,MAAM,CAAC,WAAW,CACpC,CAAC,cAAc,KAAK,SAAS;gBAC3B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,CACjD,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACpB,OAAO,CAAC,QAAQ,KAAK,IAAI;gBACvB,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAC1F,CACF;YACD,GAAG,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS;gBACnC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YACrD,GAAG,CAAC,KAAK,KAAK,SAAS;gBACrB,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACE,KAAK,EAAE;wBACL,IAAI,EAAE,iBAAiB,CAAC,YAAY,EAAE,EAAE,KAAK,CAAC,CAAC,GAAG;wBAClD,KAAK,EAAE,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG;qBAChD;iBACF,CAAC;SACP,CAAC,CAAC;QACH,OAAO,
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../src/application/manifest/lint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
//
|
|
2
|
-
|
|
3
|
-
import { DevkitError } from '../../domain/errors.js';
|
|
4
|
-
import { nearest, suggestionHint } from '../../domain/fuzzy.js';
|
|
5
|
-
import { areasOf, peopleOfArea } from '../../domain/members/owners.js';
|
|
1
|
+
// List people through the same in-memory classification view used by member show.
|
|
2
|
+
import { memberView } from '../../domain/members/classify.js';
|
|
6
3
|
import { membersOf } from './source.js';
|
|
7
4
|
export const MEMBER_COLUMNS = ['id', 'display', 'status', 'areas'];
|
|
8
5
|
export class MemberList {
|
|
@@ -12,24 +9,8 @@ export class MemberList {
|
|
|
12
9
|
}
|
|
13
10
|
execute(input) {
|
|
14
11
|
const members = membersOf(this.deps.ctx);
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
const suggestion = nearest(input.area, groups);
|
|
18
|
-
throw new DevkitError('not_found', 'AREA_NOT_FOUND', `"${input.area}" is not an area`, {
|
|
19
|
-
hint: suggestionHint(suggestion, `Areas: ${groups.join(', ') || '(none)'}.`),
|
|
20
|
-
nextSteps: ['fx member list'],
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
|
-
const inArea = input.area === undefined ? undefined : new Set(peopleOfArea(members, input.area));
|
|
24
|
-
return members.people
|
|
25
|
-
.filter((p) => inArea === undefined || inArea.has(p.id))
|
|
26
|
-
.filter((p) => input.status === undefined || (p.status ?? 'active') === input.status)
|
|
27
|
-
.map((p) => ({
|
|
28
|
-
id: p.id,
|
|
29
|
-
display: p.display ?? null,
|
|
30
|
-
status: p.status ?? 'active',
|
|
31
|
-
areas: areasOf(members, p.id),
|
|
32
|
-
}));
|
|
12
|
+
const view = memberView(members, input, new Date().toISOString().slice(0, 10));
|
|
13
|
+
return members.people.flatMap((person) => view.list(person) ?? []);
|
|
33
14
|
}
|
|
34
15
|
}
|
|
35
16
|
//# sourceMappingURL=list.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/application/member/list.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/application/member/list.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,OAAO,EAAE,UAAU,EAAqC,MAAM,kCAAkC,CAAC;AAGjG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC;AAE5E,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD,OAAO,CAAC,KAAmB;QACzB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;CACF"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
// match one query, and all of them come back.
|
|
4
4
|
import { DevkitError } from '../../domain/errors.js';
|
|
5
5
|
import { suggestionHint } from '../../domain/fuzzy.js';
|
|
6
|
+
import { memberView, } from '../../domain/members/classify.js';
|
|
6
7
|
import { findPeople, suggestPerson } from '../../domain/members/resolve.js';
|
|
7
8
|
import { membersOf } from './source.js';
|
|
8
9
|
export const PERSON_COLUMNS = [
|
|
@@ -13,15 +14,19 @@ export const PERSON_COLUMNS = [
|
|
|
13
14
|
'matched_by',
|
|
14
15
|
'via',
|
|
15
16
|
'accounts',
|
|
17
|
+
'classification',
|
|
18
|
+
'memberships',
|
|
19
|
+
'assignments',
|
|
20
|
+
'responsible_teams',
|
|
16
21
|
];
|
|
17
22
|
export class MemberShow {
|
|
18
23
|
deps;
|
|
19
24
|
constructor(deps) {
|
|
20
25
|
this.deps = deps;
|
|
21
26
|
}
|
|
22
|
-
execute(query) {
|
|
27
|
+
execute(query, input = {}) {
|
|
23
28
|
const members = membersOf(this.deps.ctx);
|
|
24
|
-
const matches = findPeople(members, query);
|
|
29
|
+
const matches = findPeople(members, query, input.system);
|
|
25
30
|
if (matches.length === 0) {
|
|
26
31
|
const suggestion = suggestPerson(members, query);
|
|
27
32
|
throw new DevkitError('not_found', 'PERSON_NOT_FOUND', `Nobody in the members document is "${query}"`, {
|
|
@@ -29,6 +34,7 @@ export class MemberShow {
|
|
|
29
34
|
nextSteps: ['fx member list'],
|
|
30
35
|
});
|
|
31
36
|
}
|
|
37
|
+
const view = memberView(members, input, new Date().toISOString().slice(0, 10));
|
|
32
38
|
return matches.map(({ person, matchedBy, via }) => ({
|
|
33
39
|
id: person.id,
|
|
34
40
|
display: person.display ?? null,
|
|
@@ -37,6 +43,7 @@ export class MemberShow {
|
|
|
37
43
|
accounts: person.accounts ?? {},
|
|
38
44
|
matched_by: matchedBy,
|
|
39
45
|
via: via ?? null,
|
|
46
|
+
...view.describe(person.id, matches.length > 1),
|
|
40
47
|
}));
|
|
41
48
|
}
|
|
42
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/application/member/show.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,gFAAgF;AAChF,8CAA8C;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAkB,MAAM,iCAAiC,CAAC;AAG5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAYxC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI;IACJ,SAAS;IACT,OAAO;IACP,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,UAAU;
|
|
1
|
+
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/application/member/show.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,gFAAgF;AAChF,8CAA8C;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EACL,UAAU,GAGX,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAkB,MAAM,iCAAiC,CAAC;AAG5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAYxC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI;IACJ,SAAS;IACT,OAAO;IACP,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,UAAU;IACV,gBAAgB;IAChB,aAAa;IACb,aAAa;IACb,mBAAmB;CACX,CAAC;AAEX,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD,OAAO,CAAC,KAAa,EAAE,QAAuD,EAAE;QAC9E,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACjD,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,kBAAkB,EAClB,sCAAsC,KAAK,GAAG,EAC9C;gBACE,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,gCAAgC,CAAC;gBAClE,SAAS,EAAE,CAAC,gBAAgB,CAAC;aAC9B,CACF,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YAClD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;YAC/B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,QAAQ;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE;YAC/B,UAAU,EAAE,SAAS;YACrB,GAAG,EAAE,GAAG,IAAI,IAAI;YAChB,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;SAChD,CAAC,CAAC,CAAC;IACN,CAAC;CACF"}
|
|
@@ -16,7 +16,7 @@ export async function planTools(deps, skills, input) {
|
|
|
16
16
|
const items = [];
|
|
17
17
|
for (const tool of input.toolchain ?? []) {
|
|
18
18
|
if (!tool.enabled || tool.skill === undefined) {
|
|
19
|
-
items.push(noVector(tool, '
|
|
19
|
+
items.push(noVector(tool, 'no Skill installation command'));
|
|
20
20
|
continue;
|
|
21
21
|
}
|
|
22
22
|
if ((await deps.process.which(tool.binary)) === undefined &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-skills.js","sourceRoot":"","sources":["../../../src/application/skill/tool-skills.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tool-skills.js","sourceRoot":"","sources":["../../../src/application/skill/tool-skills.ts"],"names":[],"mappings":"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"}
|