@angelmsger/fx 0.12.0 → 0.14.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 +72 -0
- package/defaults/tools.yaml +14 -2
- package/dist/adapters/ci/jenkins-cli/recipes.js +5 -1
- package/dist/adapters/ci/jenkins-cli/recipes.js.map +1 -1
- package/dist/adapters/family/service.js +5 -0
- package/dist/adapters/family/service.js.map +1 -1
- package/dist/adapters/log-store/openobserve-cli/provider.js +1 -1
- package/dist/adapters/log-store/openobserve-cli/provider.js.map +1 -1
- package/dist/adapters/log-store/openobserve-cli/recipes.js +5 -1
- package/dist/adapters/log-store/openobserve-cli/recipes.js.map +1 -1
- package/dist/adapters/metrics/prometheus-cli/provider.js +1 -1
- package/dist/adapters/metrics/prometheus-cli/provider.js.map +1 -1
- package/dist/adapters/process/deadline-process.js +27 -5
- package/dist/adapters/process/deadline-process.js.map +1 -1
- package/dist/application/hook/observe.js +9 -3
- package/dist/application/hook/observe.js.map +1 -1
- package/dist/application/init/standalone.js +328 -0
- package/dist/application/init/standalone.js.map +1 -0
- package/dist/application/login/verify.js +4 -2
- package/dist/application/login/verify.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/fx-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/tool/install.js +10 -22
- package/dist/application/tool/install.js.map +1 -1
- package/dist/application/tool/show.js +6 -1
- package/dist/application/tool/show.js.map +1 -1
- package/dist/application/tool/toolchain.js +1 -1
- package/dist/application/tool/toolchain.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/base.js +6 -1
- package/dist/cli/base.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/init.js +27 -4
- package/dist/cli/commands/init.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 +63 -4
- package/dist/cli/preparation-view.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/command-wiring.js +14 -0
- package/dist/composition/command-wiring.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/manifest/rules/tools.js +1 -0
- package/dist/domain/manifest/rules/tools.js.map +1 -1
- package/dist/domain/manifest/tools.schema.js +6 -0
- package/dist/domain/manifest/tools.schema.js.map +1 -1
- package/dist/domain/preparation.js.map +1 -1
- package/dist/domain/release/version.js +5 -3
- package/dist/domain/release/version.js.map +1 -1
- package/dist/domain/setup/planner.js +5 -1
- package/dist/domain/setup/planner.js.map +1 -1
- package/dist/domain/setup/types.js.map +1 -1
- package/dist/domain/toolchain/resolve.js +26 -16
- package/dist/domain/toolchain/resolve.js.map +1 -1
- package/package.json +1 -1
- package/skills/fx-workspace/SKILL.md +6 -6
- package/skills/fx-workspace/references/commands.md +12 -4
- package/skills/fx-workspace/references/initialization.md +17 -0
- package/skills/fx-workspace/references/workspace-tasks.md +3 -3
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
// Share locked, recoverable bundled Skill replacement between explicit installation
|
|
1
|
+
// Share locked, recoverable bundled Skill replacement between explicit installation, update
|
|
2
|
+
// and sync.
|
|
2
3
|
import path from 'node:path';
|
|
3
4
|
import { busyError, DevkitError } from '../../domain/errors.js';
|
|
4
5
|
import { withLease } from '../../domain/lease.js';
|
|
5
6
|
import { pathKey } from '../../domain/path.js';
|
|
6
|
-
import { decideCopy } from '../../domain/skills/projection.js';
|
|
7
|
+
import { decideCopy, } from '../../domain/skills/projection.js';
|
|
7
8
|
import { assertWritable } from '../safety/posture.js';
|
|
8
9
|
import { observeCopy } from './observe.js';
|
|
9
10
|
import { skillWriteError } from './write-error.js';
|
|
@@ -59,5 +60,21 @@ export class SkillCopies {
|
|
|
59
60
|
return action;
|
|
60
61
|
});
|
|
61
62
|
}
|
|
63
|
+
// Bring a copy fx recognizes up to this version only if it is older, decided again under
|
|
64
|
+
// the lock: a copy removed, replaced or brought up by someone else since the plan stays as
|
|
65
|
+
// it now is, so update never creates, replaces or downgrades a copy.
|
|
66
|
+
async update(target, input = {}) {
|
|
67
|
+
return withSkillLock(this.deps.fs, this.deps.skills.globalLock, target, async (canonical) => {
|
|
68
|
+
await input.validate?.(canonical);
|
|
69
|
+
const observed = await observeCopy(this.deps.fs, canonical);
|
|
70
|
+
const upgraded = observed.kind === 'ours' && decideCopy(observed, this.deps.version) === 'upgrade';
|
|
71
|
+
if (upgraded) {
|
|
72
|
+
if (input.posture)
|
|
73
|
+
assertWritable(input.posture, 'update companion Skill');
|
|
74
|
+
await this.deps.fs.replaceDir(this.deps.skills.bundledSkillDir, canonical);
|
|
75
|
+
}
|
|
76
|
+
return { observed, upgraded };
|
|
77
|
+
});
|
|
78
|
+
}
|
|
62
79
|
}
|
|
63
80
|
//# sourceMappingURL=copies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copies.js","sourceRoot":"","sources":["../../../src/application/skill/copies.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"copies.js","sourceRoot":"","sources":["../../../src/application/skill/copies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fx-copies.js","sourceRoot":"","sources":["../../../src/application/skill/fx-copies.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,sEAAsE;AAEtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAkB,MAAM,cAAc,CAAC;AAG5D,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,
|
|
1
|
+
{"version":3,"file":"fx-copies.js","sourceRoot":"","sources":["../../../src/application/skill/fx-copies.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,sEAAsE;AAEtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAkB,MAAM,cAAc,CAAC;AAG5D,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAA8C,EAC9C,MAAiB,EACjB,MAAqC;IAErC,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,KAAK,MAAM,MAAM,IAAI,MAAM,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;QACxD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3E,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAA8C,EAC9C,MAAiB,EACjB,KAAoB,EACpB,KAAsB;IAEtB,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IAClF,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5C,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;gBAC7C,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;aACvF,CAAC,CAAC;YACH,KAAK,CAAC,KAAK,CAAC,GAAG;gBACb,GAAG,IAAI;gBACP,MAAM;gBACN,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAkB,EAAE,CAAC;aACxF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { DevkitError } from '../../domain/errors.js';
|
|
|
4
4
|
import { pathKey } from '../../domain/path.js';
|
|
5
5
|
import { canonicalSkillPath } from './copies.js';
|
|
6
6
|
import { FX_SKILL } from './observe.js';
|
|
7
|
-
export async function standaloneTargets(fs, hosts, input,
|
|
7
|
+
export async function standaloneTargets(fs, hosts, input, selection = 'detected') {
|
|
8
8
|
const ids = input.agents?.flatMap((a) => a.split(',').map((id) => id.trim()));
|
|
9
9
|
if (input.dir !== undefined) {
|
|
10
10
|
if (ids?.length || input.project || !input.dir.trim())
|
|
@@ -28,10 +28,10 @@ export async function standaloneTargets(fs, hosts, input, inspect = false) {
|
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
30
|
for (const host of hosts)
|
|
31
|
-
if (
|
|
31
|
+
if (selection !== 'detected' || (await host.detect(scope, input.cwd)))
|
|
32
32
|
selected.push(host);
|
|
33
33
|
}
|
|
34
|
-
if (
|
|
34
|
+
if (selection === 'detected' && selected.length === 0)
|
|
35
35
|
throw new DevkitError('usage', 'SKILL_NO_AGENT', 'No coding agent detected', {
|
|
36
36
|
nextSteps: ['fx skill path', 'Pass --agent <id> or --dir <path> to choose a target.'],
|
|
37
37
|
});
|
|
@@ -39,8 +39,12 @@ export async function standaloneTargets(fs, hosts, input, inspect = false) {
|
|
|
39
39
|
agent: host.id,
|
|
40
40
|
path: path.resolve(host.skillsDir(scope, input.cwd), FX_SKILL),
|
|
41
41
|
}));
|
|
42
|
-
if (inspect)
|
|
42
|
+
if (selection === 'inspect')
|
|
43
43
|
return targets.sort((a, b) => a.agent.localeCompare(b.agent));
|
|
44
|
+
return mergeShared(fs, targets);
|
|
45
|
+
}
|
|
46
|
+
// Agents that share one Skill directory share one target, named after all of them.
|
|
47
|
+
async function mergeShared(fs, targets) {
|
|
44
48
|
const byPath = new Map();
|
|
45
49
|
for (const target of targets) {
|
|
46
50
|
const key = pathKey(await canonicalSkillPath(fs, target.path));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standalone-targets.js","sourceRoot":"","sources":["../../../src/application/skill/standalone-targets.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAE5F,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAI/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"standalone-targets.js","sourceRoot":"","sources":["../../../src/application/skill/standalone-targets.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export class StandaloneSkill {
|
|
|
21
21
|
this.deps = deps;
|
|
22
22
|
}
|
|
23
23
|
async paths(input) {
|
|
24
|
-
const targets = await standaloneTargets(this.deps.fs, this.deps.skills.hosts, input,
|
|
24
|
+
const targets = await standaloneTargets(this.deps.fs, this.deps.skills.hosts, input, 'inspect');
|
|
25
25
|
return Promise.all(targets.map((target) => this.inspect(target)));
|
|
26
26
|
}
|
|
27
27
|
async status(input) {
|
|
@@ -40,7 +40,7 @@ export class StandaloneSkill {
|
|
|
40
40
|
return text;
|
|
41
41
|
}
|
|
42
42
|
async write(operation, input) {
|
|
43
|
-
const targets = await standaloneTargets(this.deps.fs, this.deps.skills.hosts, input);
|
|
43
|
+
const targets = await standaloneTargets(this.deps.fs, this.deps.skills.hosts, input, operation === 'update' ? 'every' : 'detected');
|
|
44
44
|
const rows = [];
|
|
45
45
|
for (const target of targets) {
|
|
46
46
|
await this.validate(target.path);
|
|
@@ -59,6 +59,10 @@ export class StandaloneSkill {
|
|
|
59
59
|
if (operation === 'uninstall' && !(await this.confirmRemoval(rows, input.yes)))
|
|
60
60
|
return rows.map((r) => ({ ...r, status: 'skipped' }));
|
|
61
61
|
for (const [index, row] of rows.entries()) {
|
|
62
|
+
if (operation === 'update' && row.action === 'skip') {
|
|
63
|
+
rows[index] = { ...row, status: 'skipped' };
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
62
66
|
try {
|
|
63
67
|
rows[index] = await this.apply(operation, row, input.posture);
|
|
64
68
|
}
|
|
@@ -78,6 +82,8 @@ export class StandaloneSkill {
|
|
|
78
82
|
return rows;
|
|
79
83
|
}
|
|
80
84
|
async apply(operation, row, posture) {
|
|
85
|
+
if (operation === 'update')
|
|
86
|
+
return this.refreshOlder(row, posture);
|
|
81
87
|
if (operation === 'install') {
|
|
82
88
|
const action = await new SkillCopies(this.deps).install(row.path, {
|
|
83
89
|
posture,
|
|
@@ -104,6 +110,19 @@ export class StandaloneSkill {
|
|
|
104
110
|
return { ...row, status: 'removed', version: current.version };
|
|
105
111
|
});
|
|
106
112
|
}
|
|
113
|
+
async refreshOlder(row, posture) {
|
|
114
|
+
const { observed, upgraded } = await new SkillCopies(this.deps).update(row.path, {
|
|
115
|
+
posture,
|
|
116
|
+
validate: (target) => this.validate(target),
|
|
117
|
+
});
|
|
118
|
+
if (upgraded)
|
|
119
|
+
return { ...row, status: 'installed', version: this.deps.version };
|
|
120
|
+
if (observed.kind === 'foreign')
|
|
121
|
+
return { ...row, status: 'foreign' };
|
|
122
|
+
if (observed.kind === 'absent')
|
|
123
|
+
return { ...row, status: 'not_installed', version: null };
|
|
124
|
+
return { ...row, status: 'skipped', version: observed.version };
|
|
125
|
+
}
|
|
107
126
|
async confirmRemoval(rows, yes) {
|
|
108
127
|
const remove = rows.filter((r) => r.action === 'remove');
|
|
109
128
|
return (remove.length === 0 ||
|
|
@@ -140,6 +159,9 @@ function versionState(installed, bundled) {
|
|
|
140
159
|
function mutationAction(operation, row) {
|
|
141
160
|
if (operation === 'uninstall')
|
|
142
161
|
return row.status === 'installed' ? 'remove' : 'skip';
|
|
162
|
+
// Update brings an older copy fx recognizes to this version, and touches nothing else.
|
|
163
|
+
if (operation === 'update')
|
|
164
|
+
return row.version_state === 'older' ? 'refresh' : 'skip';
|
|
143
165
|
if (row.status === 'foreign')
|
|
144
166
|
return 'replace';
|
|
145
167
|
return row.status === 'installed' ? 'refresh' : 'install';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standalone.js","sourceRoot":"","sources":["../../../src/application/skill/standalone.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAE9F,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIpE,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACL,iBAAiB,GAGlB,MAAM,yBAAyB,CAAC;AAgCjC,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,OAAO;IACP,MAAM;IACN,QAAQ;IACR,SAAS;IACT,eAAe;CACP,CAAC;AACX,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"standalone.js","sourceRoot":"","sources":["../../../src/application/skill/standalone.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,6 +132,32 @@ export function awaitsApproval(item) {
|
|
|
132
132
|
export function wasHeldBack(item) {
|
|
133
133
|
return item.vector === null && item.note === HELD_BACK;
|
|
134
134
|
}
|
|
135
|
+
// The Skills of tools fx just chose, installed or updated outside the sync stage, approved
|
|
136
|
+
// and ready for runTools. A preview plans each tool as if it were already installed, since
|
|
137
|
+
// the same run would install it.
|
|
138
|
+
export async function planToolSkills(deps, skills, input) {
|
|
139
|
+
const toolchain = input.tools.map((tool) => ({ ...tool, installOnInit: true }));
|
|
140
|
+
const status = input.dryRun ? 'planned' : 'not_started';
|
|
141
|
+
const items = (await planTools(deps, skills, { toolchain, dryRun: input.dryRun, posture: input.posture })).map((item) => ({ ...item, status }));
|
|
142
|
+
if (input.dryRun || input.trust === undefined)
|
|
143
|
+
return items;
|
|
144
|
+
return trustAll(items, toolchain, input.trust);
|
|
145
|
+
}
|
|
146
|
+
// One tool's Skill across every agent directory it went to, in a word for the tool's row.
|
|
147
|
+
// A run cut short leaves the rest not started, which is not installed.
|
|
148
|
+
export function toolSkillOutcome(items, tool) {
|
|
149
|
+
const own = items.filter((item) => item.tool === tool);
|
|
150
|
+
if (own.some(awaitsApproval))
|
|
151
|
+
return 'blocked';
|
|
152
|
+
const ran = own.filter((item) => item.vector !== null);
|
|
153
|
+
if (ran.length === 0)
|
|
154
|
+
return 'none';
|
|
155
|
+
if (ran.some((item) => item.status === 'failed' || item.failure !== undefined))
|
|
156
|
+
return 'failed';
|
|
157
|
+
if (ran.some((item) => item.status === 'not_started'))
|
|
158
|
+
return 'not_started';
|
|
159
|
+
return ran.some((item) => item.status === 'planned') ? 'planned' : 'installed';
|
|
160
|
+
}
|
|
135
161
|
export async function runTools(deps, items) {
|
|
136
162
|
// A tool installs into one directory per agent; its progress is still one start and one end.
|
|
137
163
|
const pending = new Map();
|
|
@@ -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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"}
|
|
@@ -5,15 +5,6 @@ import { assertWritable } from '../safety/posture.js';
|
|
|
5
5
|
import { recoveryCommand } from '../workspace/guidance.js';
|
|
6
6
|
import { assertToolSelection, selectTools } from './select.js';
|
|
7
7
|
import { probeToolVersion } from './version.js';
|
|
8
|
-
export const TOOL_INSTALL_COLUMNS = [
|
|
9
|
-
'name',
|
|
10
|
-
'via',
|
|
11
|
-
'vector',
|
|
12
|
-
'ran',
|
|
13
|
-
'code',
|
|
14
|
-
'version_after',
|
|
15
|
-
'error',
|
|
16
|
-
];
|
|
17
8
|
export class ToolInstall {
|
|
18
9
|
deps;
|
|
19
10
|
constructor(deps) {
|
|
@@ -204,22 +195,19 @@ export class ToolInstall {
|
|
|
204
195
|
],
|
|
205
196
|
});
|
|
206
197
|
}
|
|
207
|
-
// --all: every enabled tool whose binary is not on PATH
|
|
208
|
-
// is a `tool update` decision,
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
198
|
+
// --all: install takes every enabled tool whose binary is not on PATH, and update every
|
|
199
|
+
// one whose binary is. An outdated tool is a `tool update` decision, and a missing one a
|
|
200
|
+
// `tool install` decision; neither command makes the other's implicitly.
|
|
201
|
+
async selectAll(input) {
|
|
202
|
+
const selected = [];
|
|
203
|
+
for (const tool of input.tools) {
|
|
212
204
|
if (!tool.enabled)
|
|
213
205
|
continue;
|
|
214
|
-
|
|
215
|
-
|
|
206
|
+
const present = (await this.deps.process.which(tool.binary)) !== undefined;
|
|
207
|
+
if (present === input.update)
|
|
208
|
+
selected.push(tool);
|
|
216
209
|
}
|
|
217
|
-
return
|
|
218
|
-
}
|
|
219
|
-
async selectAll(input) {
|
|
220
|
-
if (input.update)
|
|
221
|
-
return input.tools.filter((tool) => tool.enabled);
|
|
222
|
-
return this.needing(input.tools);
|
|
210
|
+
return selected;
|
|
223
211
|
}
|
|
224
212
|
}
|
|
225
213
|
//# sourceMappingURL=install.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/application/tool/install.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAE5E,OAAO,EACL,aAAa,EACb,WAAW,EACX,UAAU,EACV,iBAAiB,GAElB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EACL,aAAa,GAGd,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/application/tool/install.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,12 @@ export class ToolShow {
|
|
|
33
33
|
},
|
|
34
34
|
auth: tool.auth === undefined
|
|
35
35
|
? null
|
|
36
|
-
: {
|
|
36
|
+
: {
|
|
37
|
+
command: tool.auth.command,
|
|
38
|
+
json: tool.auth.json ?? null,
|
|
39
|
+
login: tool.auth.login ?? null,
|
|
40
|
+
docs: tool.auth.docs ?? null,
|
|
41
|
+
},
|
|
37
42
|
setup_steps: tool.setup.map((s) => ({ id: s.id, kind: s.kind, title: s.title })),
|
|
38
43
|
fields,
|
|
39
44
|
source: input.sources.get(tool.name)?.kind ?? 'catalog',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/application/tool/show.ts"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,0CAA0C;
|
|
1
|
+
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/application/tool/show.ts"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,0CAA0C;AAQ1C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAuC1C,MAAM,OAAO,QAAQ;IACnB,OAAO,CAAC,KAAoB;QAC1B,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAiB,CAAC;QAC9E,MAAM,MAAM,GAA2B,EAAE,CAAC;QAC1C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QACxD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,aAAa;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;QAC5D,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI;YACpC,eAAe,EAAE,IAAI,CAAC,aAAa,IAAI,KAAK;YAC5C,YAAY,EAAE,IAAI,CAAC,WAAW;YAC9B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChC,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;gBACpB,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;aAC7B,CAAC,CAAC;YACH,KAAK,EACH,IAAI,CAAC,KAAK,KAAK,SAAS;gBACtB,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC;oBACE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;oBAC3B,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI;oBACxC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI;iBACrC;YACP,IAAI,EACF,IAAI,CAAC,IAAI,KAAK,SAAS;gBACrB,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC;oBACE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;oBAC1B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI;oBAC5B,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI;oBAC9B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI;iBAC7B;YACP,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YAChF,MAAM;YACN,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,SAAS;YACvD,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,IAAI,EAAE;YACrD,cAAc,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;SAClD,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -34,7 +34,7 @@ export function toolsOf(bundle) {
|
|
|
34
34
|
const { doc, provenance, declared } = bundle.tools.result;
|
|
35
35
|
return resolveTools(doc, provenance, declared);
|
|
36
36
|
}
|
|
37
|
-
function bundledToolchain(bundledText, cliVersion) {
|
|
37
|
+
export function bundledToolchain(bundledText, cliVersion) {
|
|
38
38
|
const { doc, provenance, declared } = loadTools(bundledText, undefined, { cliVersion });
|
|
39
39
|
const tools = resolveTools(doc, provenance, declared);
|
|
40
40
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../../../src/application/tool/toolchain.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAC5F,yFAAyF;AACzF,uCAAuC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAqB,MAAM,mCAAmC,CAAC;AACpF,OAAO,EACL,YAAY,EACZ,aAAa,EACb,aAAa,EACb,eAAe,GAGhB,MAAM,kCAAkC,CAAC;AAqB1C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAAuB;IAC5D,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,CAAC,GAAG,YAAY,WAAW,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB;YAAE,MAAM,GAAG,CAAC;QACnF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,8DAA8D;YACvE,SAAS,EAAE,CAAC,+BAA+B,CAAC;SAC7C,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAqB;IAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC3E,OAAO,EAAE,GAAG,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;AACvE,CAAC;AAED,0FAA0F;AAC1F,2FAA2F;AAC3F,SAAS,cAAc,CAAC,GAAqB;IAC3C,OAAO,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,MAAsB;IAC5C,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;IAC1D,OAAO,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../../../src/application/tool/toolchain.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAC5F,yFAAyF;AACzF,uCAAuC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAqB,MAAM,mCAAmC,CAAC;AACpF,OAAO,EACL,YAAY,EACZ,aAAa,EACb,aAAa,EACb,eAAe,GAGhB,MAAM,kCAAkC,CAAC;AAqB1C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAAuB;IAC5D,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,CAAC,GAAG,YAAY,WAAW,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB;YAAE,MAAM,GAAG,CAAC;QACnF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,8DAA8D;YACvE,SAAS,EAAE,CAAC,+BAA+B,CAAC;SAC7C,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAqB;IAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC3E,OAAO,EAAE,GAAG,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;AACvE,CAAC;AAED,0FAA0F;AAC1F,2FAA2F;AAC3F,SAAS,cAAc,CAAC,GAAqB;IAC3C,OAAO,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,MAAsB;IAC5C,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;IAC1D,OAAO,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAAmB,EAAE,UAAkB;IACtE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACxF,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACtD,OAAO;QACL,KAAK;QACL,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QACpF,SAAS,EAAE,SAAS;KACrB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
// `fx tool install` and `fx tool update`: the package operation, then the Skill of every
|
|
2
|
+
// tool it installed or updated, so the agents read the instructions of the version now on
|
|
3
|
+
// PATH. Init and sync run their own Skill stage after installing and do not come here.
|
|
4
|
+
import { withPartialResult } from '../../domain/errors.js';
|
|
5
|
+
import { planToolSkills, runTools, toolSkillOutcome, } from '../skill/tool-skills.js';
|
|
6
|
+
import { recoveryCommand } from '../workspace/guidance.js';
|
|
7
|
+
export const TOOL_INSTALL_COLUMNS = [
|
|
8
|
+
'name',
|
|
9
|
+
'via',
|
|
10
|
+
'vector',
|
|
11
|
+
'ran',
|
|
12
|
+
'code',
|
|
13
|
+
'version_after',
|
|
14
|
+
'skill',
|
|
15
|
+
'error',
|
|
16
|
+
];
|
|
17
|
+
export class ToolInstallWithSkills {
|
|
18
|
+
deps;
|
|
19
|
+
constructor(deps) {
|
|
20
|
+
this.deps = deps;
|
|
21
|
+
}
|
|
22
|
+
async execute(input) {
|
|
23
|
+
const results = await this.deps.install.execute(input);
|
|
24
|
+
const changed = new Set(results.filter(changedPackage).map((row) => row.name));
|
|
25
|
+
let items = [];
|
|
26
|
+
const rows = () => results.map((row) => ({ ...row, skill: toolSkillOutcome(items, row.name) }));
|
|
27
|
+
try {
|
|
28
|
+
items = await planToolSkills(this.deps, this.deps.skills, {
|
|
29
|
+
tools: input.tools.filter((tool) => changed.has(tool.name)),
|
|
30
|
+
dryRun: input.dryRun,
|
|
31
|
+
posture: input.posture,
|
|
32
|
+
trust: input.trust,
|
|
33
|
+
});
|
|
34
|
+
if (!input.dryRun)
|
|
35
|
+
await runTools(this.deps, items);
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
// The packages changed whatever became of the Skills; the result says both.
|
|
39
|
+
throw withPartialResult(error, { items: rows(), has_more: false });
|
|
40
|
+
}
|
|
41
|
+
if (input.update && input.all === true)
|
|
42
|
+
this.notInstalled(input, results);
|
|
43
|
+
return rows();
|
|
44
|
+
}
|
|
45
|
+
// A workspace's toolchain is what it needs, so one of its tools left out of `update --all`
|
|
46
|
+
// for not being installed is worth a word; the bundled catalog outside one is not.
|
|
47
|
+
notInstalled(input, results) {
|
|
48
|
+
const workspace = input.trust?.workspace;
|
|
49
|
+
if (workspace === undefined)
|
|
50
|
+
return;
|
|
51
|
+
const updated = new Set(results.map((row) => row.name));
|
|
52
|
+
const missing = input.tools.filter((tool) => tool.enabled && !updated.has(tool.name));
|
|
53
|
+
if (missing.length === 0)
|
|
54
|
+
return;
|
|
55
|
+
this.deps.reporter.notice({
|
|
56
|
+
code: 'TOOLS_NOT_INSTALLED',
|
|
57
|
+
message: `not installed, so not updated: ${missing.map((tool) => tool.name).join(', ')}`,
|
|
58
|
+
nextSteps: [
|
|
59
|
+
recoveryCommand({ workspace, commandShell: this.deps.commandShell }, 'tool', 'install', '--all'),
|
|
60
|
+
],
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
// A row whose package operation ran, or would run in a preview; a manual tool has none.
|
|
65
|
+
function changedPackage(row) {
|
|
66
|
+
return row.vector !== null && (row.status === 'done' || row.status === 'planned');
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=with-skills.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"with-skills.js","sourceRoot":"","sources":["../../../src/application/tool/with-skills.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export function fxOutdated(verdict) {
|
|
|
6
6
|
return {
|
|
7
7
|
code: 'FX_OUTDATED',
|
|
8
8
|
message: `fx ${verdict.current} is behind ${verdict.latest}`,
|
|
9
|
-
nextSteps: ['fx self update --yes'
|
|
9
|
+
nextSteps: ['fx self update --yes'],
|
|
10
10
|
silence: SILENCE,
|
|
11
11
|
};
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notices.js","sourceRoot":"","sources":["../../../src/application/update/notices.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAM5E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,UAAU,UAAU,CAAC,OAAkB;IAC3C,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACjE,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,cAAc,OAAO,CAAC,MAAM,EAAE;QAC5D,SAAS,EAAE,CAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"notices.js","sourceRoot":"","sources":["../../../src/application/update/notices.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAM5E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,UAAU,UAAU,CAAC,OAAkB;IAC3C,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACjE,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,cAAc,OAAO,CAAC,MAAM,EAAE;QAC5D,SAAS,EAAE,CAAC,sBAAsB,CAAC;QACnC,OAAO,EAAE,OAAO;KACjB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAwB;IACvD,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IACtC,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,wCAAwC,OAAO,CAAC,SAAS,kDAAkD;QACpH,SAAS,EAAE,CAAC,SAAS,CAAC;QACtB,OAAO,EAAE,OAAO;KACjB,CAAC;AACJ,CAAC"}
|
package/dist/cli/base.js
CHANGED
|
@@ -160,7 +160,9 @@ export class FxCommand extends Command {
|
|
|
160
160
|
else
|
|
161
161
|
this.renderer.record(result);
|
|
162
162
|
if (bound.state === 'incomplete' && exitIncomplete) {
|
|
163
|
-
const error = new DevkitError('incomplete', 'PREPARATION_INCOMPLETE',
|
|
163
|
+
const error = new DevkitError('incomplete', 'PREPARATION_INCOMPLETE', bound.scope.workspace === null
|
|
164
|
+
? 'Required tool setup is unfinished'
|
|
165
|
+
: 'Required workspace preparation is unfinished', {
|
|
164
166
|
nextSteps: [
|
|
165
167
|
bound.next.message,
|
|
166
168
|
'Use preparation.next_actions for Agent work; preparation.resume continues after the blockers change.',
|
|
@@ -238,6 +240,9 @@ export class FxCommand extends Command {
|
|
|
238
240
|
initDeps() {
|
|
239
241
|
return this.wiring().initDeps();
|
|
240
242
|
}
|
|
243
|
+
standaloneInitDeps() {
|
|
244
|
+
return this.wiring().standaloneInitDeps();
|
|
245
|
+
}
|
|
241
246
|
stageDeps() {
|
|
242
247
|
return this.wiring().stageDeps();
|
|
243
248
|
}
|