@angelmsger/fx 0.14.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 +17 -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/sync/index.js +29 -15
- package/dist/application/sync/index.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 +2 -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/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/workspace-tasks.md +3 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,23 @@
|
|
|
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
|
+
|
|
5
22
|
## 0.14.0 (2026-10-28)
|
|
6
23
|
|
|
7
24
|
### 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":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { asDevkitError, toEnvelope, withPartialResult } from '../../domain/errors.js';
|
|
3
3
|
import { preparationCheck, } from '../../domain/preparation.js';
|
|
4
4
|
import { leavesCheckoutUsable } from '../../domain/workspace/plan.js';
|
|
5
|
+
import { filesInTheWayReason } from '../../domain/workspace/state.js';
|
|
5
6
|
import { requireUsableManifest } from '../manifest/prepare.js';
|
|
6
7
|
import { pooled } from '../pool.js';
|
|
7
8
|
import { workspacePreparation } from '../preparation.js';
|
|
@@ -165,11 +166,15 @@ export class Sync {
|
|
|
165
166
|
if (item.fetch)
|
|
166
167
|
await git.fetch(dir, 'upstream');
|
|
167
168
|
if (item.action === 'fast_forward' && item.branch !== undefined) {
|
|
168
|
-
const
|
|
169
|
-
const
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
169
|
+
const forwarded = await git.fastForward(dir, 'upstream', item.branch);
|
|
170
|
+
const { outcome } = forwarded;
|
|
171
|
+
const reason = skipReason(forwarded, item.branch);
|
|
172
|
+
if (reason !== undefined) {
|
|
173
|
+
reporter.progress({ id: item.name, state: 'skip', detail: reason });
|
|
174
|
+
const files = forwarded.outcome === 'local_files_in_the_way'
|
|
175
|
+
? { files_in_the_way: forwarded.paths }
|
|
176
|
+
: {};
|
|
177
|
+
return { ...item, ...added, result: 'skipped', outcome, reason, ...files };
|
|
173
178
|
}
|
|
174
179
|
const result = outcome === 'diverged' ? 'skipped' : 'done';
|
|
175
180
|
reporter.progress({
|
|
@@ -192,15 +197,25 @@ export class Sync {
|
|
|
192
197
|
}
|
|
193
198
|
}
|
|
194
199
|
}
|
|
195
|
-
//
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
200
|
+
// Why a fast-forward that moved nothing was skipped, when a person has to know.
|
|
201
|
+
function skipReason(result, branch) {
|
|
202
|
+
switch (result.outcome) {
|
|
203
|
+
case 'empty_remote':
|
|
204
|
+
return 'upstream has no commits yet; nothing to fast-forward';
|
|
205
|
+
case 'no_remote_branch':
|
|
206
|
+
return `upstream has no ${branch} branch; check the branch the manifest tracks`;
|
|
207
|
+
case 'local_files_in_the_way':
|
|
208
|
+
return filesInTheWayReason(result.paths);
|
|
209
|
+
case 'updated':
|
|
210
|
+
case 'up_to_date':
|
|
211
|
+
case 'diverged':
|
|
212
|
+
return undefined;
|
|
213
|
+
}
|
|
203
214
|
}
|
|
215
|
+
// An empty upstream has had no first push yet, so it leaves readiness alone. A missing
|
|
216
|
+
// branch in one that has others may mean the manifest tracks the wrong branch, and
|
|
217
|
+
// diverged commits or files in the way wait for a person.
|
|
218
|
+
const HELD_BACK = new Set(['diverged', 'no_remote_branch', 'local_files_in_the_way']);
|
|
204
219
|
function manifestReason(refresh) {
|
|
205
220
|
switch (refresh?.result) {
|
|
206
221
|
case 'updated':
|
|
@@ -231,8 +246,7 @@ function repositoryChecks(items) {
|
|
|
231
246
|
.filter((item) => item.action !== 'skip_unpicked')
|
|
232
247
|
.map((item) => {
|
|
233
248
|
const ready = item.result !== 'failed' &&
|
|
234
|
-
item.outcome
|
|
235
|
-
item.outcome !== 'no_remote_branch' &&
|
|
249
|
+
!HELD_BACK.has(item.outcome ?? '') &&
|
|
236
250
|
leavesCheckoutUsable(item.action);
|
|
237
251
|
let state = ready ? 'ready' : 'blocked';
|
|
238
252
|
if (item.result === 'planned')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/application/sync/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/application/sync/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ const INCOMPLETE = new Set([
|
|
|
23
23
|
'skip_remote_mismatch',
|
|
24
24
|
'diverged',
|
|
25
25
|
'no_remote_branch',
|
|
26
|
+
'local_files_in_the_way',
|
|
26
27
|
]);
|
|
27
28
|
const STATE_KEYS = new Set(['status', 'state', 'action', 'result', 'activation', 'outcome']);
|
|
28
29
|
const COUNT_SUFFIX = new RegExp(`(?:^|_)(${[...UNFINISHED, 'problems'].join('|')})$`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exceptional.js","sourceRoot":"","sources":["../../../src/cli/render/exceptional.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAE7F,OAAO,EACL,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,eAAe,GAChB,MAAM,iCAAiC,CAAC;AAEzC,kFAAkF;AAClF,gCAAgC;AAChC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAS;IACjC,QAAQ;IACR,SAAS;IACT,aAAa;IACb,SAAS;IACT,UAAU;IACV,SAAS;IACT,YAAY;IACZ,YAAY;IACZ,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC;IAC/E,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC;CAC1E,CAAC,CAAC;AACH,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,GAAG,UAAU;IACb,iBAAiB;IACjB,YAAY;IACZ,eAAe;IACf,cAAc;IACd,sBAAsB;IACtB,UAAU;IACV,kBAAkB;
|
|
1
|
+
{"version":3,"file":"exceptional.js","sourceRoot":"","sources":["../../../src/cli/render/exceptional.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/render/tone.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tone.js","sourceRoot":"","sources":["../../../src/cli/render/tone.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,kDAAkD;AAElD,OAAO,EACL,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,eAAe,GAIhB,MAAM,iCAAiC,CAAC;AAIzC,MAAM,UAAU,GAAuD;IACrE,EAAE,EAAE;QACF,IAAI;QACJ,OAAO;QACP,MAAM;QACN,UAAU;QACV,UAAU;QACV,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,YAAY;QACZ,UAAU;KACX;IACD,IAAI,EAAE;QACJ,MAAM;QACN,UAAU;QACV,SAAS;QACT,YAAY;QACZ,aAAa;QACb,YAAY;QACZ,UAAU;QACV,YAAY;QACZ,eAAe;QACf,cAAc;QACd,sBAAsB;QACtB,kBAAkB;
|
|
1
|
+
{"version":3,"file":"tone.js","sourceRoot":"","sources":["../../../src/cli/render/tone.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,kDAAkD;AAElD,OAAO,EACL,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,eAAe,GAIhB,MAAM,iCAAiC,CAAC;AAIzC,MAAM,UAAU,GAAuD;IACrE,EAAE,EAAE;QACF,IAAI;QACJ,OAAO;QACP,MAAM;QACN,UAAU;QACV,UAAU;QACV,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,YAAY;QACZ,UAAU;KACX;IACD,IAAI,EAAE;QACJ,MAAM;QACN,UAAU;QACV,SAAS;QACT,YAAY;QACZ,aAAa;QACb,YAAY;QACZ,UAAU;QACV,YAAY;QACZ,eAAe;QACf,cAAc;QACd,sBAAsB;QACtB,kBAAkB;QAClB,wBAAwB;KACzB;IACD,IAAI,EAAE;QACJ,MAAM;QACN,QAAQ;QACR,SAAS;QACT,SAAS;QACT,cAAc;QACd,YAAY;QACZ,eAAe;QACf,cAAc;KACf;IACD,wCAAwC;IACxC,KAAK,EAAE;QACL,SAAS;QACT,SAAS;QACT,MAAM;QACN,eAAe;QACf,eAAe;QACf,cAAc;QACd,MAAM;QACN,gBAAgB;QAChB,eAAe;QACf,aAAa;KACd;CACF,CAAC;AAIF,kFAAkF;AAClF,MAAM,UAAU,GAA4C;IAC1D,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,oCAAoC;AACpC,MAAM,WAAW,GAA6D;IAC5E,SAAS,EAAE,OAAO;IAClB,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,MAAM;IACf,iBAAiB,EAAE,MAAM;CAC1B,CAAC;AAEF,SAAS,aAAa,CAAC,MAAwB,EAAE,KAAsB;IACrE,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,OAAO,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAe;IACpC,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CACtD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,CAAC,IAAI,EAAE,IAAY,CAAC,CAAC,CAC1D;IACD,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzF,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;CACpF,CAAC,CAAC;AAEH,sFAAsF;AACtF,kCAAkC;AAClC,MAAM,UAAU,MAAM,CAAC,KAAc;IACnC,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC"}
|
|
@@ -9,6 +9,7 @@ import { TomlMcpCodec } from '../adapters/agent-host/toml-mcp.js';
|
|
|
9
9
|
import { larkCalendarProvider } from '../adapters/calendar/lark-calendar/provider.js';
|
|
10
10
|
import { wecomCalendarProvider } from '../adapters/calendar/wecom-calendar/provider.js';
|
|
11
11
|
import { wecomCalendarCliProvider } from '../adapters/calendar/wecom-calendar-cli/provider.js';
|
|
12
|
+
import { wecomChannelProvider } from '../adapters/channel/wecom-channel-cli/provider.js';
|
|
12
13
|
import { githubActionsProvider } from '../adapters/ci/github-actions/provider.js';
|
|
13
14
|
import { jenkinsCliProvider } from '../adapters/ci/jenkins-cli/provider.js';
|
|
14
15
|
import { kubectlProvider } from '../adapters/cluster/kubectl/provider.js';
|
|
@@ -105,6 +106,7 @@ register(confluenceProvider);
|
|
|
105
106
|
register(larkWikiProvider);
|
|
106
107
|
register(larkProvider);
|
|
107
108
|
register(wecomProvider);
|
|
109
|
+
register(wecomChannelProvider);
|
|
108
110
|
register(larkCalendarProvider);
|
|
109
111
|
register(wecomCalendarProvider);
|
|
110
112
|
register(wecomCalendarCliProvider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/composition/registry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/composition/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export const CAPABILITIES = [
|
|
|
6
6
|
'issue-tracker',
|
|
7
7
|
'knowledge-base',
|
|
8
8
|
'im',
|
|
9
|
+
'channel',
|
|
9
10
|
'calendar',
|
|
10
11
|
'meeting',
|
|
11
12
|
'task',
|
|
@@ -25,6 +26,7 @@ export const CAPABILITY_INFO = {
|
|
|
25
26
|
'issue-tracker': { scope: 'workspace', desc: 'where work items are tracked' },
|
|
26
27
|
'knowledge-base': { scope: 'workspace', desc: 'where team documentation lives' },
|
|
27
28
|
im: { scope: 'workspace', desc: 'how people are messaged' },
|
|
29
|
+
channel: { scope: 'workspace', desc: 'where channel posts, replies and updates live' },
|
|
28
30
|
calendar: { scope: 'workspace', desc: 'where schedules and availability live' },
|
|
29
31
|
meeting: { scope: 'workspace', desc: 'where online meetings, recordings and minutes live' },
|
|
30
32
|
task: { scope: 'workspace', desc: 'where personal and team to-dos are tracked' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capability.js","sourceRoot":"","sources":["../../src/domain/capability.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,sFAAsF;AACtF,sFAAsF;AAEtF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,WAAW;IACX,eAAe;IACf,gBAAgB;IAChB,IAAI;IACJ,UAAU;IACV,SAAS;IACT,MAAM;IACN,SAAS;IACT,eAAe;IACf,WAAW;IACX,SAAS;IACT,IAAI;IACJ,SAAS;IACT,WAAW;IACX,YAAY;IACZ,KAAK;IACL,iBAAiB;CACT,CAAC;AAWX,MAAM,CAAC,MAAM,eAAe,GAAuC;IACjE,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,kDAAkD,EAAE;IAC7F,eAAe,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,8BAA8B,EAAE;IAC7E,gBAAgB,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,gCAAgC,EAAE;IAChF,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,yBAAyB,EAAE;IAC3D,QAAQ,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,uCAAuC,EAAE;IAC/E,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,oDAAoD,EAAE;IAC3F,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,4CAA4C,EAAE;IAChF,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,sCAAsC,EAAE;IAC7E,eAAe,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,oCAAoC,EAAE;IACrF,WAAW,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,yBAAyB,EAAE;IACtE,OAAO,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,mCAAmC,EAAE;IAC5E,EAAE,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,EAAE;IACtD,OAAO,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,uCAAuC,EAAE;IAChF,SAAS,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,mCAAmC,EAAE;IAC3E,YAAY,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,kCAAkC,EAAE;IAC7E,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,0BAA0B,EAAE;IAC5D,iBAAiB,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,oCAAoC,EAAE;CACrF,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,KAAsB;IACxD,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;AACxE,CAAC;AAED,iFAAiF;AACjF,yCAAyC;AACzC,MAAM,UAAU,oBAAoB;IAClC,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;AAC7E,CAAC;AAOD,MAAM,UAAU,eAAe,CAAC,IAAoB;IAClD,OAAQ,YAAkC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,IAAmB,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1F,CAAC"}
|
|
1
|
+
{"version":3,"file":"capability.js","sourceRoot":"","sources":["../../src/domain/capability.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,sFAAsF;AACtF,sFAAsF;AAEtF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,WAAW;IACX,eAAe;IACf,gBAAgB;IAChB,IAAI;IACJ,SAAS;IACT,UAAU;IACV,SAAS;IACT,MAAM;IACN,SAAS;IACT,eAAe;IACf,WAAW;IACX,SAAS;IACT,IAAI;IACJ,SAAS;IACT,WAAW;IACX,YAAY;IACZ,KAAK;IACL,iBAAiB;CACT,CAAC;AAWX,MAAM,CAAC,MAAM,eAAe,GAAuC;IACjE,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,kDAAkD,EAAE;IAC7F,eAAe,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,8BAA8B,EAAE;IAC7E,gBAAgB,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,gCAAgC,EAAE;IAChF,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,yBAAyB,EAAE;IAC3D,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,+CAA+C,EAAE;IACtF,QAAQ,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,uCAAuC,EAAE;IAC/E,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,oDAAoD,EAAE;IAC3F,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,4CAA4C,EAAE;IAChF,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,sCAAsC,EAAE;IAC7E,eAAe,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,oCAAoC,EAAE;IACrF,WAAW,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,yBAAyB,EAAE;IACtE,OAAO,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,mCAAmC,EAAE;IAC5E,EAAE,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,EAAE;IACtD,OAAO,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,uCAAuC,EAAE;IAChF,SAAS,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,mCAAmC,EAAE;IAC3E,YAAY,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,kCAAkC,EAAE;IAC7E,GAAG,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,0BAA0B,EAAE;IAC5D,iBAAiB,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,oCAAoC,EAAE;CACrF,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,KAAsB;IACxD,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;AACxE,CAAC;AAED,iFAAiF;AACjF,yCAAyC;AACzC,MAAM,UAAU,oBAAoB;IAClC,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;AAC7E,CAAC;AAOD,MAAM,UAAU,eAAe,CAAC,IAAoB;IAClD,OAAQ,YAAkC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,IAAmB,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1F,CAAC"}
|
package/dist/domain/semver.js
CHANGED
|
@@ -1,15 +1,8 @@
|
|
|
1
|
-
// @ts-check
|
|
2
1
|
// Just enough semver for version floors: parse, compare, and tell a release
|
|
3
2
|
// from a development build. A prerelease or 0.0.0 is a development build.
|
|
4
|
-
//
|
|
5
|
-
|
|
6
|
-
* @typedef {{ major: number, minor: number, patch: number, prerelease?: string }} Semver
|
|
7
|
-
*/
|
|
3
|
+
// Lenient on purpose: tools print `v1.2.3` or `1.2.3+build`. The release gate
|
|
4
|
+
// does not use it, because a release tag must be exactly `v<version>`.
|
|
8
5
|
const PATTERN = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/;
|
|
9
|
-
/**
|
|
10
|
-
* @param {string} text
|
|
11
|
-
* @returns {Semver | undefined}
|
|
12
|
-
*/
|
|
13
6
|
export function parseSemver(text) {
|
|
14
7
|
const m = PATTERN.exec(text.trim());
|
|
15
8
|
if (m === null)
|
|
@@ -17,20 +10,11 @@ export function parseSemver(text) {
|
|
|
17
10
|
const base = { major: Number(m[1]), minor: Number(m[2]), patch: Number(m[3]) };
|
|
18
11
|
return m[4] === undefined ? base : { ...base, prerelease: m[4] };
|
|
19
12
|
}
|
|
20
|
-
/**
|
|
21
|
-
* @param {string} text
|
|
22
|
-
* @returns {boolean}
|
|
23
|
-
*/
|
|
24
13
|
export function isSemver(text) {
|
|
25
14
|
return parseSemver(text) !== undefined;
|
|
26
15
|
}
|
|
27
|
-
/**
|
|
28
|
-
* @param {Semver} a
|
|
29
|
-
* @param {Semver} b
|
|
30
|
-
* @returns {number}
|
|
31
|
-
*/
|
|
32
16
|
export function compareSemver(a, b) {
|
|
33
|
-
for (const part of
|
|
17
|
+
for (const part of ['major', 'minor', 'patch']) {
|
|
34
18
|
if (a[part] !== b[part])
|
|
35
19
|
return a[part] < b[part] ? -1 : 1;
|
|
36
20
|
}
|
|
@@ -42,19 +26,10 @@ export function compareSemver(a, b) {
|
|
|
42
26
|
return -1;
|
|
43
27
|
return a.prerelease < b.prerelease ? -1 : 1;
|
|
44
28
|
}
|
|
45
|
-
/**
|
|
46
|
-
* @param {string} text
|
|
47
|
-
* @returns {boolean}
|
|
48
|
-
*/
|
|
49
29
|
export function isRelease(text) {
|
|
50
30
|
const v = parseSemver(text);
|
|
51
31
|
return v !== undefined && v.prerelease === undefined && (v.major | v.minor | v.patch) !== 0;
|
|
52
32
|
}
|
|
53
|
-
/**
|
|
54
|
-
* @param {string} version
|
|
55
|
-
* @param {string} floor
|
|
56
|
-
* @returns {boolean}
|
|
57
|
-
*/
|
|
58
33
|
export function atLeast(version, floor) {
|
|
59
34
|
const v = parseSemver(version);
|
|
60
35
|
const f = parseSemver(floor);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semver.js","sourceRoot":"","sources":["../../src/domain/semver.
|
|
1
|
+
{"version":3,"file":"semver.js","sourceRoot":"","sources":["../../src/domain/semver.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,uEAAuE;AASvE,MAAM,OAAO,GAAG,oEAAoE,CAAC;AAErF,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACpC,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACjC,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,CAAS,EAAE,CAAS;IAChD,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC;YAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,UAAU;QAAE,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC9F,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAe,EAAE,KAAa;IACpD,MAAM,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrD,OAAO,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
// What a checkout looks like right now, and the parsers that read it off
|
|
2
2
|
// git's machine-readable output. `dirty` means tracked changes; untracked
|
|
3
3
|
// paths are counted separately from the index/worktree changes used by sync.
|
|
4
|
-
// Ignored paths are not requested
|
|
4
|
+
// Ignored paths are not requested: the fast-forward itself refuses to replace any
|
|
5
|
+
// file the branch does not track, and names them.
|
|
5
6
|
export function parsePorcelainStatus(text) {
|
|
6
7
|
let branch;
|
|
7
8
|
let ahead = 0;
|
|
@@ -27,6 +28,15 @@ export function parsePorcelainStatus(text) {
|
|
|
27
28
|
}
|
|
28
29
|
return { branch, dirty, untracked, ahead, behind };
|
|
29
30
|
}
|
|
31
|
+
const NAMED_FILES = 5;
|
|
32
|
+
// Why a checkout was left as it was when updating it would replace files the branch
|
|
33
|
+
// does not track: the first few are named, the rest counted.
|
|
34
|
+
export function filesInTheWayReason(paths) {
|
|
35
|
+
const named = paths.slice(0, NAMED_FILES).join(', ');
|
|
36
|
+
const rest = paths.length - NAMED_FILES;
|
|
37
|
+
const list = named === '' ? '' : `: ${named}${rest > 0 ? ` and ${rest} more` : ''}`;
|
|
38
|
+
return `upstream would replace local files Git does not track${list}; move them aside to update`;
|
|
39
|
+
}
|
|
30
40
|
export function parseRemotes(text) {
|
|
31
41
|
const remotes = {};
|
|
32
42
|
for (const line of text.split('\n')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/domain/workspace/state.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,0EAA0E;AAC1E,6EAA6E;AAC7E,kFAAkF;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/domain/workspace/state.ts"],"names":[],"mappings":"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"}
|
package/dist/ports/git.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Git as sync and status need it, and nothing more: there is deliberately no checkout,
|
|
2
2
|
// reset, stash, rebase or merge here, so "sync never destroys work" holds at the type
|
|
3
3
|
// level. A fast-forward on the checked-out branch is the one merge that can happen, and
|
|
4
|
-
// only when the tree is clean
|
|
4
|
+
// only when the tree is clean and no file the branch does not track, ignored ones
|
|
5
|
+
// included, would be overwritten; on any other branch only the branch ref moves.
|
|
5
6
|
export {};
|
|
6
7
|
//# sourceMappingURL=git.js.map
|
package/dist/ports/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/ports/git.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,sFAAsF;AACtF,wFAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/ports/git.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,sFAAsF;AACtF,wFAAwF;AACxF,kFAAkF;AAClF,iFAAiF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
---
|
|
2
2
|
name: fx-workspace
|
|
3
|
-
version: 0.
|
|
3
|
+
version: 0.15.0
|
|
4
4
|
description: 'Use only when the user explicitly asks for the fx workspace CLI or manifest, or the current task is inside an fx-managed workspace or routed by its fx-derived AGENTS.md. Drive workspace init and sync, repository status and selection, manifest validation and editing, companion tools and login, doctor, agent Skills, repository ownership, environment coordinates and readiness through can/where, and release checks across dependencies, branches, builds and errors. Do not use for generic Sentry, OpenObserve, Jenkins, Kubernetes, logs, errors or builds outside an fx-managed workspace.'
|
|
5
5
|
metadata:
|
|
6
6
|
requires:
|
|
@@ -160,6 +160,9 @@ It never checks out, resets, stashes, merges or rebases. Dirty or diverged work
|
|
|
160
160
|
reported as `skip_dirty` / `skip_diverged`; inspect repository and resource outcomes.
|
|
161
161
|
An empty upstream is skipped with outcome `empty_remote`; one lacking the tracked branch
|
|
162
162
|
is skipped with `no_remote_branch` and still blocks readiness. Neither is a failure.
|
|
163
|
+
An update that would replace local untracked or ignored files (for example `.env`) is
|
|
164
|
+
skipped with `local_files_in_the_way`, lists them in `files_in_the_way` and blocks
|
|
165
|
+
readiness; ask before moving them aside.
|
|
163
166
|
|
|
164
167
|
The workspace root is a plain directory. Do not initialize or run Git there.
|
|
165
168
|
Write output that belongs to no repository under `.workbench/` as the derived
|