@skillcap/gdh 0.7.0 → 0.8.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/INSTALL-BUNDLE.json +1 -1
- package/README.md +4 -4
- package/node_modules/@gdh/adapters/dist/index.d.ts +3 -1
- package/node_modules/@gdh/adapters/dist/index.d.ts.map +1 -1
- package/node_modules/@gdh/adapters/dist/index.js +65 -17
- package/node_modules/@gdh/adapters/dist/index.js.map +1 -1
- package/node_modules/@gdh/adapters/dist/self-update-mechanics.d.ts.map +1 -1
- package/node_modules/@gdh/adapters/dist/self-update-mechanics.js +9 -1
- package/node_modules/@gdh/adapters/dist/self-update-mechanics.js.map +1 -1
- package/node_modules/@gdh/adapters/package.json +8 -8
- package/node_modules/@gdh/authoring/dist/prepare.d.ts.map +1 -1
- package/node_modules/@gdh/authoring/dist/prepare.js +5 -1
- package/node_modules/@gdh/authoring/dist/prepare.js.map +1 -1
- package/node_modules/@gdh/authoring/package.json +2 -2
- package/node_modules/@gdh/cli/dist/index.d.ts +35 -0
- package/node_modules/@gdh/cli/dist/index.d.ts.map +1 -1
- package/node_modules/@gdh/cli/dist/index.js +227 -137
- package/node_modules/@gdh/cli/dist/index.js.map +1 -1
- package/node_modules/@gdh/cli/dist/migrate.d.ts +4 -0
- package/node_modules/@gdh/cli/dist/migrate.d.ts.map +1 -1
- package/node_modules/@gdh/cli/dist/migrate.js +13 -0
- package/node_modules/@gdh/cli/dist/migrate.js.map +1 -1
- package/node_modules/@gdh/cli/dist/self-update.d.ts.map +1 -1
- package/node_modules/@gdh/cli/dist/self-update.js +52 -3
- package/node_modules/@gdh/cli/dist/self-update.js.map +1 -1
- package/node_modules/@gdh/cli/dist/setup.d.ts +41 -0
- package/node_modules/@gdh/cli/dist/setup.d.ts.map +1 -1
- package/node_modules/@gdh/cli/dist/setup.js +181 -26
- package/node_modules/@gdh/cli/dist/setup.js.map +1 -1
- package/node_modules/@gdh/cli/package.json +10 -10
- package/node_modules/@gdh/core/dist/index.d.ts +75 -1
- package/node_modules/@gdh/core/dist/index.d.ts.map +1 -1
- package/node_modules/@gdh/core/dist/index.js +45 -1
- package/node_modules/@gdh/core/dist/index.js.map +1 -1
- package/node_modules/@gdh/core/dist/update-cache.d.ts +12 -0
- package/node_modules/@gdh/core/dist/update-cache.d.ts.map +1 -1
- package/node_modules/@gdh/core/dist/update-cache.js +20 -0
- package/node_modules/@gdh/core/dist/update-cache.js.map +1 -1
- package/node_modules/@gdh/core/dist/update-probe.d.ts.map +1 -1
- package/node_modules/@gdh/core/dist/update-probe.js +7 -1
- package/node_modules/@gdh/core/dist/update-probe.js.map +1 -1
- package/node_modules/@gdh/core/package.json +1 -1
- package/node_modules/@gdh/docs/dist/index.d.ts +2 -0
- package/node_modules/@gdh/docs/dist/index.d.ts.map +1 -1
- package/node_modules/@gdh/docs/dist/index.js +1 -0
- package/node_modules/@gdh/docs/dist/index.js.map +1 -1
- package/node_modules/@gdh/docs/dist/recovery-hints.d.ts +43 -0
- package/node_modules/@gdh/docs/dist/recovery-hints.d.ts.map +1 -0
- package/node_modules/@gdh/docs/dist/recovery-hints.js +203 -0
- package/node_modules/@gdh/docs/dist/recovery-hints.js.map +1 -0
- package/node_modules/@gdh/docs/package.json +2 -2
- package/node_modules/@gdh/mcp/package.json +8 -8
- package/node_modules/@gdh/observability/package.json +2 -2
- package/node_modules/@gdh/runtime/package.json +2 -2
- package/node_modules/@gdh/scan/dist/detect-existing-onboarding.d.ts +19 -0
- package/node_modules/@gdh/scan/dist/detect-existing-onboarding.d.ts.map +1 -0
- package/node_modules/@gdh/scan/dist/detect-existing-onboarding.js +58 -0
- package/node_modules/@gdh/scan/dist/detect-existing-onboarding.js.map +1 -0
- package/node_modules/@gdh/scan/dist/index.d.ts +1 -0
- package/node_modules/@gdh/scan/dist/index.d.ts.map +1 -1
- package/node_modules/@gdh/scan/dist/index.js +1 -0
- package/node_modules/@gdh/scan/dist/index.js.map +1 -1
- package/node_modules/@gdh/scan/dist/onboard.d.ts +2 -0
- package/node_modules/@gdh/scan/dist/onboard.d.ts.map +1 -1
- package/node_modules/@gdh/scan/dist/onboard.js +12 -4
- package/node_modules/@gdh/scan/dist/onboard.js.map +1 -1
- package/node_modules/@gdh/scan/package.json +3 -3
- package/node_modules/@gdh/verify/package.json +7 -7
- package/package.json +11 -11
|
@@ -12,13 +12,17 @@ export interface GdhMigrationAction {
|
|
|
12
12
|
readonly summary: string;
|
|
13
13
|
readonly command: readonly string[] | null;
|
|
14
14
|
}
|
|
15
|
+
export type GdhMigrationMode = "preview" | "applied";
|
|
15
16
|
export interface GdhMigrationResult {
|
|
16
17
|
readonly migrationId: typeof GDH_PROJECT_SURFACE_MIGRATION_ID;
|
|
17
18
|
readonly targetPath: string;
|
|
18
19
|
readonly dryRun: boolean;
|
|
20
|
+
readonly mode: GdhMigrationMode;
|
|
19
21
|
readonly state: MigrationRunState;
|
|
20
22
|
readonly summary: string;
|
|
21
23
|
readonly reasons: readonly string[];
|
|
24
|
+
readonly blockingReasons: readonly string[];
|
|
25
|
+
readonly coupledReasons: readonly string[];
|
|
22
26
|
readonly compatibility: GdhProjectLifecycleCompatibilityResult;
|
|
23
27
|
readonly validation: GdhProjectLifecycleCompatibilityResult | null;
|
|
24
28
|
readonly actions: readonly GdhMigrationAction[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,0BAA0B,EAE1B,sCAAsC,EAEvC,MAAM,WAAW,CAAC;AAOnB,eAAO,MAAM,gCAAgC,iCAAiC,CAAC;AAE/E,KAAK,mBAAmB,GACpB,cAAc,GACd,kBAAkB,GAClB,aAAa,GACb,kBAAkB,GAClB,aAAa,GACb,eAAe,CAAC;AACpB,KAAK,oBAAoB,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AAC5E,KAAK,iBAAiB,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;AAEpE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC;IACrC,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CAC5C;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,WAAW,EAAE,OAAO,gCAAgC,CAAC;IAC9D,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,aAAa,EAAE,sCAAsC,CAAC;IAC/D,QAAQ,CAAC,UAAU,EAAE,sCAAsC,GAAG,IAAI,CAAC;IACnE,QAAQ,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAC;CACjD;AAyBD,wBAAsB,8BAA8B,CAAC,KAAK,EAAE;IAC1D,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAAC,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,0BAA0B,EAE1B,sCAAsC,EAEvC,MAAM,WAAW,CAAC;AAOnB,eAAO,MAAM,gCAAgC,iCAAiC,CAAC;AAE/E,KAAK,mBAAmB,GACpB,cAAc,GACd,kBAAkB,GAClB,aAAa,GACb,kBAAkB,GAClB,aAAa,GACb,eAAe,CAAC;AACpB,KAAK,oBAAoB,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AAC5E,KAAK,iBAAiB,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;AAEpE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC;IACrC,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CAC5C;AAED,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,SAAS,CAAC;AAMrD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,WAAW,EAAE,OAAO,gCAAgC,CAAC;IAC9D,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,aAAa,EAAE,sCAAsC,CAAC;IAC/D,QAAQ,CAAC,UAAU,EAAE,sCAAsC,GAAG,IAAI,CAAC;IACnE,QAAQ,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAC;CACjD;AAyBD,wBAAsB,8BAA8B,CAAC,KAAK,EAAE;IAC1D,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAqJ9B;AAkpBD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAqB5D"}
|
|
@@ -7,6 +7,9 @@ import { resolveGdhProductMetadata } from "@gdh/core";
|
|
|
7
7
|
import { inspectRuntimeBridgeSurface, repairRuntimeBridgeSurface, } from "@gdh/runtime";
|
|
8
8
|
import { applyRepairableOnboardingWrites } from "@gdh/scan";
|
|
9
9
|
export const GDH_PROJECT_SURFACE_MIGRATION_ID = "project_surface_lifecycle_v1";
|
|
10
|
+
function computeMigrationMode(dryRun) {
|
|
11
|
+
return dryRun ? "preview" : "applied";
|
|
12
|
+
}
|
|
10
13
|
const PROJECT_CONFIG_PATH = ".gdh/project.yaml";
|
|
11
14
|
const LEGACY_RECIPE_DIRECTORY = ".gdh/recipes";
|
|
12
15
|
const PRIMARY_RUN_CONFIGURATION_DIRECTORY = ".gdh/run-configurations";
|
|
@@ -51,11 +54,14 @@ export async function migrateProjectLifecycleSurface(input) {
|
|
|
51
54
|
migrationId: GDH_PROJECT_SURFACE_MIGRATION_ID,
|
|
52
55
|
targetPath,
|
|
53
56
|
dryRun: input.dryRun,
|
|
57
|
+
mode: computeMigrationMode(input.dryRun),
|
|
54
58
|
state: "blocked",
|
|
55
59
|
summary: compatibility.state === "migration_blocked"
|
|
56
60
|
? "Project-surface migration is blocked by incompatible or conflicting managed surfaces."
|
|
57
61
|
: "Project-surface migration requires manual review before automatic apply is safe.",
|
|
58
62
|
reasons: compatibility.reasons,
|
|
63
|
+
blockingReasons: compatibility.blockingReasons,
|
|
64
|
+
coupledReasons: compatibility.coupledReasons,
|
|
59
65
|
compatibility,
|
|
60
66
|
validation: null,
|
|
61
67
|
actions: blockingActions,
|
|
@@ -115,11 +121,18 @@ export async function migrateProjectLifecycleSurface(input) {
|
|
|
115
121
|
migrationId: GDH_PROJECT_SURFACE_MIGRATION_ID,
|
|
116
122
|
targetPath,
|
|
117
123
|
dryRun: input.dryRun,
|
|
124
|
+
mode: computeMigrationMode(input.dryRun),
|
|
118
125
|
state,
|
|
119
126
|
summary: summarizeMigrationState(state, input.dryRun, validation),
|
|
120
127
|
reasons: state === "blocked" || (validation !== null && isRuntimeBridgePluginEnablePending(validation))
|
|
121
128
|
? validation?.reasons ?? compatibility.reasons
|
|
122
129
|
: [],
|
|
130
|
+
blockingReasons: state === "blocked" || (validation !== null && isRuntimeBridgePluginEnablePending(validation))
|
|
131
|
+
? validation?.blockingReasons ?? compatibility.blockingReasons
|
|
132
|
+
: [],
|
|
133
|
+
coupledReasons: state === "blocked" || (validation !== null && isRuntimeBridgePluginEnablePending(validation))
|
|
134
|
+
? validation?.coupledReasons ?? compatibility.coupledReasons
|
|
135
|
+
: [],
|
|
123
136
|
compatibility,
|
|
124
137
|
validation,
|
|
125
138
|
actions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self-update.d.ts","sourceRoot":"","sources":["../src/self-update.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,KAAK,EAOX,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"self-update.d.ts","sourceRoot":"","sources":["../src/self-update.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,KAAK,EAOX,MAAM,YAAY,CAAC;AAyBpB,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,KAAK,GACR,OAAO,CAAC,MAAM,CAAC,CA8HjB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { bumpAndRebakePin, } from "@gdh/adapters";
|
|
2
2
|
import { resolveNpmLatestVersion, } from "@gdh/core";
|
|
3
3
|
import { extractPositionalArgs, findUnsupportedOptionsError, formatCliError, readSingleOptionValue, recordSessionEvent, writeJsonResult, } from "./index.js";
|
|
4
|
+
import { migrateProjectLifecycleSurface } from "./migrate.js";
|
|
4
5
|
/**
|
|
5
6
|
* Phase 13 Plan 13-02: CLI wrapper for `gdh self-update`.
|
|
6
7
|
*
|
|
@@ -77,12 +78,15 @@ export async function runSelfUpdateCommand(args, io) {
|
|
|
77
78
|
reason,
|
|
78
79
|
};
|
|
79
80
|
// stderr banner first, then stdout JSON (flush-order convention).
|
|
80
|
-
|
|
81
|
+
// Phase 16 UPD-06: pendingMigration is null on any non-"updated" state;
|
|
82
|
+
// keep the JSON shape uniform by emitting the field explicitly.
|
|
83
|
+
emitSelfUpdateStderrSummary(io, blockedResult, null);
|
|
81
84
|
writeJsonResult(io, {
|
|
82
85
|
command: "gdh self-update",
|
|
83
86
|
targetPath,
|
|
84
87
|
dryRun,
|
|
85
88
|
result: blockedResult,
|
|
89
|
+
pendingMigration: null,
|
|
86
90
|
});
|
|
87
91
|
await safeRecordSessionEvent(targetPath, {
|
|
88
92
|
commandStartedAtMs,
|
|
@@ -102,13 +106,15 @@ export async function runSelfUpdateCommand(args, io) {
|
|
|
102
106
|
targetVersion,
|
|
103
107
|
dryRun,
|
|
104
108
|
});
|
|
109
|
+
const pendingMigration = await resolvePendingMigration(targetPath, result);
|
|
105
110
|
// Phase 11 D-11 flush-order — stderr FIRST, then stdout JSON.
|
|
106
|
-
emitSelfUpdateStderrSummary(io, result);
|
|
111
|
+
emitSelfUpdateStderrSummary(io, result, pendingMigration);
|
|
107
112
|
writeJsonResult(io, {
|
|
108
113
|
command: "gdh self-update",
|
|
109
114
|
targetPath,
|
|
110
115
|
dryRun,
|
|
111
116
|
result,
|
|
117
|
+
pendingMigration,
|
|
112
118
|
});
|
|
113
119
|
await safeRecordSessionEvent(targetPath, {
|
|
114
120
|
commandStartedAtMs,
|
|
@@ -204,12 +210,48 @@ async function safeRecordSessionEvent(targetPath, partial) {
|
|
|
204
210
|
// Session event writes MUST NOT fail the primary command (D-18).
|
|
205
211
|
}
|
|
206
212
|
}
|
|
213
|
+
/**
|
|
214
|
+
* Phase 16 UPD-06: probe whether a project-surface migration is pending
|
|
215
|
+
* after a successful self-update. Shape mirrors the same dry-run call that
|
|
216
|
+
* `/gdh-status` runs — single source of truth for "what migration would
|
|
217
|
+
* happen now". Returns null on any non-"updated" result.state AND on any
|
|
218
|
+
* probe error (D-18-adjacent: probe failure MUST NOT alter the primary
|
|
219
|
+
* command's exit code or JSON shape).
|
|
220
|
+
*/
|
|
221
|
+
async function resolvePendingMigration(targetPath, result) {
|
|
222
|
+
if (result.state !== "updated") {
|
|
223
|
+
return null;
|
|
224
|
+
}
|
|
225
|
+
try {
|
|
226
|
+
const migration = await migrateProjectLifecycleSurface({
|
|
227
|
+
targetPath,
|
|
228
|
+
dryRun: true,
|
|
229
|
+
});
|
|
230
|
+
if (migration.state !== "planned") {
|
|
231
|
+
return null;
|
|
232
|
+
}
|
|
233
|
+
return {
|
|
234
|
+
state: "planned",
|
|
235
|
+
reasons: migration.reasons,
|
|
236
|
+
recommendedCommand: "gdh migrate --apply",
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
catch {
|
|
240
|
+
// D-18-adjacent: probe failure MUST NOT alter the self-update exit code.
|
|
241
|
+
return null;
|
|
242
|
+
}
|
|
243
|
+
}
|
|
207
244
|
/**
|
|
208
245
|
* D-17 stderr one-liner. ANSI color only when stderr.isTTY is truthy.
|
|
209
246
|
* `noop` and `skipped_dev_mode` are always plain — per design they are
|
|
210
247
|
* normal/expected states, not warnings.
|
|
248
|
+
*
|
|
249
|
+
* Phase 16 UPD-06 criterion 4: when `result.state === "updated"` AND a
|
|
250
|
+
* non-null `pendingMigration` is supplied, a single literal suffix is
|
|
251
|
+
* appended to the constructed line. Longer narration lives in the skill
|
|
252
|
+
* renderers (Plan 16-04); the CLI reports state factually.
|
|
211
253
|
*/
|
|
212
|
-
function emitSelfUpdateStderrSummary(io, result) {
|
|
254
|
+
function emitSelfUpdateStderrSummary(io, result, pendingMigration) {
|
|
213
255
|
const tty = Boolean(io.stderr.isTTY ?? process.stderr.isTTY);
|
|
214
256
|
const color = (ansi, core) => tty ? `${ansi}${core}\x1b[0m` : core;
|
|
215
257
|
let line;
|
|
@@ -230,6 +272,13 @@ function emitSelfUpdateStderrSummary(io, result) {
|
|
|
230
272
|
line = color("\x1b[31m", `✗ GDH self-update blocked — ${result.reason}.`);
|
|
231
273
|
break;
|
|
232
274
|
}
|
|
275
|
+
// Phase 16 UPD-06 criterion 4: single-literal suffix when a project-surface
|
|
276
|
+
// migration is pending. Longer narration lives in the skill renderers
|
|
277
|
+
// (Plan 16-04). D-17 one-liner discipline preserved — still a single
|
|
278
|
+
// io.stderr.write call.
|
|
279
|
+
if (result.state === "updated" && pendingMigration !== null) {
|
|
280
|
+
line += " — pending migration: gdh migrate --apply";
|
|
281
|
+
}
|
|
233
282
|
io.stderr.write(`${line}\n`);
|
|
234
283
|
}
|
|
235
284
|
//# sourceMappingURL=self-update.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self-update.js","sourceRoot":"","sources":["../src/self-update.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,GAEjB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,uBAAuB,GAExB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAEL,qBAAqB,EACrB,2BAA2B,EAC3B,cAAc,EACd,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,GAChB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"self-update.js","sourceRoot":"","sources":["../src/self-update.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,9 +29,50 @@ export declare function executeSetupCommand(input: GdhSetupCommandInput, options
|
|
|
29
29
|
export declare function renderSetupIntro(): void;
|
|
30
30
|
export declare function renderSetupOutro(result: GdhSetupCommandResult): void;
|
|
31
31
|
export declare function renderSetupSummary(result: GdhSetupCommandResult): string;
|
|
32
|
+
/**
|
|
33
|
+
* UX-03 (Phase 18 Plan 04) — tagged-union dispatch on `action.kind`.
|
|
34
|
+
*
|
|
35
|
+
* `run_command` actions render with semantic intent (their human-authored
|
|
36
|
+
* `summary` or, as a fallback, their `command.join(" ")`) so that the
|
|
37
|
+
* codex register/remove pair at `packages/adapters/src/index.ts:2684-2722`
|
|
38
|
+
* surfaces as two DISTINCT plan lines instead of two indistinguishable
|
|
39
|
+
* `Update <home>/.codex/config.toml` lines.
|
|
40
|
+
*
|
|
41
|
+
* All other kinds (`write_file`, `ensure_symlink`, and any unknown-future
|
|
42
|
+
* kind) preserve the pre-phase-18 `${verb} ${target}` rendering
|
|
43
|
+
* BYTE-IDENTICAL so existing test assertions continue to pass
|
|
44
|
+
* (ROADMAP criterion 5).
|
|
45
|
+
*
|
|
46
|
+
* Exported so `packages/cli/src/setup.test.ts` can exercise the dispatch
|
|
47
|
+
* directly; the function remains otherwise file-private by convention.
|
|
48
|
+
*/
|
|
49
|
+
export declare function summarizePlannedActions(actions: readonly {
|
|
50
|
+
readonly state: "planned" | "applied" | "unchanged" | "blocked";
|
|
51
|
+
readonly mode?: "create" | "replace" | "unchanged";
|
|
52
|
+
readonly relativePath?: string | null;
|
|
53
|
+
readonly absolutePath?: string | null;
|
|
54
|
+
readonly kind?: string;
|
|
55
|
+
readonly summary?: string | null;
|
|
56
|
+
readonly command?: readonly string[] | null;
|
|
57
|
+
}[]): readonly string[];
|
|
32
58
|
declare class SetupCanceledError extends Error {
|
|
33
59
|
constructor();
|
|
34
60
|
}
|
|
35
61
|
export declare function isSetupCanceledError(error: unknown): error is SetupCanceledError;
|
|
62
|
+
/**
|
|
63
|
+
* Phase 18 plan 03 (UX-02) — typed recoveryHint renderer.
|
|
64
|
+
*
|
|
65
|
+
* When an unknown error bubbles out of `executeSetupCommand`, callers pass
|
|
66
|
+
* it through this helper. If the error is a `DurableTruthCollisionError`
|
|
67
|
+
* (detected via the dual-package-hazard-safe `isDurableTruthCollisionError`
|
|
68
|
+
* predicate from `@gdh/core`), the structured `recoveryHint` is rendered
|
|
69
|
+
* to the provided stderr sink as a multi-line block. Non-matching errors
|
|
70
|
+
* are left untouched; the caller's existing generic failure branch then
|
|
71
|
+
* renders them normally.
|
|
72
|
+
*
|
|
73
|
+
* This lives here (not in `index.ts`) so the pre-flight matrix, the apply
|
|
74
|
+
* try/catch sweep, and the outer CLI catch share a single rendering.
|
|
75
|
+
*/
|
|
76
|
+
export declare function renderDurableTruthCollisionHint(error: unknown, stderr: Pick<NodeJS.WriteStream, "write">): boolean;
|
|
36
77
|
export {};
|
|
37
78
|
//# sourceMappingURL=setup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"AAqBA,OAAO,
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,16 +4,71 @@ import path from "node:path";
|
|
|
4
4
|
import { promisify } from "node:util";
|
|
5
5
|
import { cancel, confirm, intro, isCancel, multiselect, note, outro, select, spinner, } from "@clack/prompts";
|
|
6
6
|
import { getSupportedAgentAdaptersStatus, installSupportedAgentAdapters, SUPPORTED_AGENTS, } from "@gdh/adapters";
|
|
7
|
-
import { resolveCurrentGdhInstall, resolveGdhProductMetadata, } from "@gdh/core";
|
|
7
|
+
import { DurableTruthCollisionError, isDurableTruthCollisionError, resolveCurrentGdhInstall, resolveGdhProductMetadata, } from "@gdh/core";
|
|
8
8
|
import { installRuntimeBridgeSurface } from "@gdh/runtime";
|
|
9
|
-
import { onboardGodotProject, scanGodotProjectInventory } from "@gdh/scan";
|
|
9
|
+
import { detectExistingOnboarding, onboardGodotProject, scanGodotProjectInventory, } from "@gdh/scan";
|
|
10
10
|
import pc from "picocolors";
|
|
11
11
|
const execFile = promisify(execFileCallback);
|
|
12
12
|
export async function executeSetupCommand(input, options) {
|
|
13
13
|
const discovery = await discoverSetupContext(input);
|
|
14
|
-
|
|
14
|
+
// Phase 18 plan 03 (UX-02): pre-flight onboarded-target detection + recovery
|
|
15
|
+
// matrix dispatch. Runs AFTER discoverSetupContext so the prompt can name
|
|
16
|
+
// the detected Godot project, and BEFORE any applySetupWithFeedback work so
|
|
17
|
+
// the spinner never freezes on an onboarded-collision throw. Detection is
|
|
18
|
+
// scoped to `discovery.scanRootPath` (the absolute path onboard will write
|
|
19
|
+
// to), NOT `input.targetPath`, per RESEARCH pitfall 4 (brownfield monorepo).
|
|
20
|
+
const onboardingState = await detectExistingOnboarding(discovery.scanRootPath);
|
|
21
|
+
let selection = options.interactive
|
|
15
22
|
? await promptForSetupSelection(discovery, input)
|
|
16
23
|
: resolveNonInteractiveSelection(discovery, input);
|
|
24
|
+
if (onboardingState.state === "onboarded") {
|
|
25
|
+
const projectLabel = discovery.scanRootPath;
|
|
26
|
+
const migrateHint = {
|
|
27
|
+
command: "gdh migrate --apply",
|
|
28
|
+
skillName: "/gdh-migrate",
|
|
29
|
+
summary: "Existing GDH onboarding detected. Run migrate to refresh durable truth.",
|
|
30
|
+
};
|
|
31
|
+
if (!options.interactive) {
|
|
32
|
+
// Non-interactive (--yes) default: clear blocker for CI/automation.
|
|
33
|
+
// No prompt, no silent overwrite (RESEARCH pitfall 5 / A4).
|
|
34
|
+
throw new DurableTruthCollisionError({
|
|
35
|
+
relativePath: ".gdh/project.yaml",
|
|
36
|
+
recoveryHint: migrateHint,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
const choice = await select({
|
|
40
|
+
message: `GDH is already onboarded at ${projectLabel}. What would you like to do?`,
|
|
41
|
+
options: [
|
|
42
|
+
{
|
|
43
|
+
value: "refresh",
|
|
44
|
+
label: "Refresh — rewrite managed durable truth in place",
|
|
45
|
+
hint: "Equivalent to `gdh migrate --apply` scoped to this setup run",
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
value: "migrate",
|
|
49
|
+
label: "Migrate — exit and run the dedicated migrate flow",
|
|
50
|
+
hint: "Suggests the /gdh-migrate skill or `gdh migrate --apply`",
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
value: "cancel",
|
|
54
|
+
label: "Cancel — exit without changes",
|
|
55
|
+
},
|
|
56
|
+
],
|
|
57
|
+
});
|
|
58
|
+
if (isCancel(choice) || choice === "cancel") {
|
|
59
|
+
cancel("GDH setup canceled.");
|
|
60
|
+
throw new SetupCanceledError();
|
|
61
|
+
}
|
|
62
|
+
if (choice === "migrate") {
|
|
63
|
+
throw new DurableTruthCollisionError({
|
|
64
|
+
relativePath: ".gdh/project.yaml",
|
|
65
|
+
recoveryHint: migrateHint,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
if (choice === "refresh") {
|
|
69
|
+
selection = { ...selection, allowDurableTruthOverwrites: true };
|
|
70
|
+
}
|
|
71
|
+
}
|
|
17
72
|
if (options.interactive) {
|
|
18
73
|
// Phase 01.1 Plan 02 Rule 1 fix: previewSetup calls installSupportedAgentAdapters(dryRun=true)
|
|
19
74
|
// which still uses the strict resolvePinnedVersion (D-06), so on a greenfield target where
|
|
@@ -225,34 +280,68 @@ async function previewSetup(discovery, selection) {
|
|
|
225
280
|
}
|
|
226
281
|
async function applySetupWithFeedback(discovery, selection, interactive) {
|
|
227
282
|
const progress = interactive ? spinner() : null;
|
|
283
|
+
// Phase 18 plan 03 (UX-02 criterion 2): spinner-discipline sweep. Each
|
|
284
|
+
// awaited call below is wrapped in try/catch so a thrown exception renders
|
|
285
|
+
// on the spinner via `progress?.error(<short label>)` BEFORE re-throwing.
|
|
286
|
+
// The pre-warm site further down retains its existing non-fatal
|
|
287
|
+
// `.stop(...)` semantics per phase 02 D-04 and is intentionally excluded
|
|
288
|
+
// from this sweep.
|
|
228
289
|
progress?.start("Scaffolding the GDH project surface");
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
290
|
+
let onboarding;
|
|
291
|
+
try {
|
|
292
|
+
onboarding = await onboardGodotProject(discovery.scanRootPath, {
|
|
293
|
+
selectedProjectRelativePath: selection.selectedProject.relativePath,
|
|
294
|
+
allowDurableTruthOverwrites: selection.allowDurableTruthOverwrites === true,
|
|
295
|
+
});
|
|
296
|
+
}
|
|
297
|
+
catch (error) {
|
|
298
|
+
progress?.error("Scaffolding failed");
|
|
299
|
+
throw error;
|
|
300
|
+
}
|
|
232
301
|
progress?.stop(`Scaffolded ${onboarding.writes.length} GDH project surface write(s).`);
|
|
233
302
|
await ensureGitignoreEntries(discovery.integrationRootPath);
|
|
234
303
|
progress?.start("Installing repo-local agent support");
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
304
|
+
let repoAdapterInstall;
|
|
305
|
+
try {
|
|
306
|
+
repoAdapterInstall = await installSupportedAgentAdapters(discovery.scanRootPath, {
|
|
307
|
+
agents: selection.selectedAgents,
|
|
308
|
+
integrationRootPath: discovery.integrationRootPath,
|
|
309
|
+
devRepoPath: resolveCurrentGdhInstall(import.meta.url).defaultDevRepoPath,
|
|
310
|
+
});
|
|
311
|
+
}
|
|
312
|
+
catch (error) {
|
|
313
|
+
progress?.error("Agent-support install failed");
|
|
314
|
+
throw error;
|
|
315
|
+
}
|
|
240
316
|
progress?.stop(summarizeAppliedActions("Installed repo-local agent support", repoAdapterInstall.actions));
|
|
241
317
|
let codexUserInstall = null;
|
|
242
318
|
if (selection.selectedAgents.includes("codex")) {
|
|
243
319
|
progress?.start("Installing user-local Codex registration");
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
320
|
+
try {
|
|
321
|
+
codexUserInstall = await installSupportedAgentAdapters(discovery.scanRootPath, {
|
|
322
|
+
user: true,
|
|
323
|
+
agents: ["codex"],
|
|
324
|
+
integrationRootPath: discovery.integrationRootPath,
|
|
325
|
+
});
|
|
326
|
+
}
|
|
327
|
+
catch (error) {
|
|
328
|
+
progress?.error("Codex registration failed");
|
|
329
|
+
throw error;
|
|
330
|
+
}
|
|
249
331
|
progress?.stop(summarizeAppliedActions("Installed user-local Codex registration", codexUserInstall.actions));
|
|
250
332
|
}
|
|
251
333
|
progress?.start("Installing the runtime bridge");
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
334
|
+
let bridgeInstall;
|
|
335
|
+
try {
|
|
336
|
+
bridgeInstall = await installRuntimeBridgeSurface({
|
|
337
|
+
targetPath: discovery.scanRootPath,
|
|
338
|
+
projectConfig: onboarding.projectConfig,
|
|
339
|
+
});
|
|
340
|
+
}
|
|
341
|
+
catch (error) {
|
|
342
|
+
progress?.error("Runtime-bridge install failed");
|
|
343
|
+
throw error;
|
|
344
|
+
}
|
|
256
345
|
if (bridgeInstall.state === "blocked") {
|
|
257
346
|
progress?.error(bridgeInstall.summary);
|
|
258
347
|
throw new Error(bridgeInstall.summary);
|
|
@@ -384,14 +473,50 @@ function renderSetupPlan(discovery, selection, preview) {
|
|
|
384
473
|
: [" No runtime bridge changes needed."]),
|
|
385
474
|
].join("\n");
|
|
386
475
|
}
|
|
387
|
-
|
|
476
|
+
/**
|
|
477
|
+
* UX-03 (Phase 18 Plan 04) — tagged-union dispatch on `action.kind`.
|
|
478
|
+
*
|
|
479
|
+
* `run_command` actions render with semantic intent (their human-authored
|
|
480
|
+
* `summary` or, as a fallback, their `command.join(" ")`) so that the
|
|
481
|
+
* codex register/remove pair at `packages/adapters/src/index.ts:2684-2722`
|
|
482
|
+
* surfaces as two DISTINCT plan lines instead of two indistinguishable
|
|
483
|
+
* `Update <home>/.codex/config.toml` lines.
|
|
484
|
+
*
|
|
485
|
+
* All other kinds (`write_file`, `ensure_symlink`, and any unknown-future
|
|
486
|
+
* kind) preserve the pre-phase-18 `${verb} ${target}` rendering
|
|
487
|
+
* BYTE-IDENTICAL so existing test assertions continue to pass
|
|
488
|
+
* (ROADMAP criterion 5).
|
|
489
|
+
*
|
|
490
|
+
* Exported so `packages/cli/src/setup.test.ts` can exercise the dispatch
|
|
491
|
+
* directly; the function remains otherwise file-private by convention.
|
|
492
|
+
*/
|
|
493
|
+
export function summarizePlannedActions(actions) {
|
|
388
494
|
return actions
|
|
389
495
|
.filter((action) => action.state !== "unchanged")
|
|
390
|
-
.map((action) =>
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
496
|
+
.map((action) => renderPlanAction(action));
|
|
497
|
+
}
|
|
498
|
+
function renderPlanAction(action) {
|
|
499
|
+
if (action.kind === "run_command") {
|
|
500
|
+
// Prefer the human-authored summary when non-empty. Guard against the
|
|
501
|
+
// truthy-empty-string case (RESEARCH Pitfall 3) with an explicit length
|
|
502
|
+
// check rather than a bare truthy test.
|
|
503
|
+
if (action.summary !== null &&
|
|
504
|
+
action.summary !== undefined &&
|
|
505
|
+
action.summary.length > 0) {
|
|
506
|
+
return action.summary;
|
|
507
|
+
}
|
|
508
|
+
if (action.command && action.command.length > 0) {
|
|
509
|
+
return `Run ${action.command.join(" ")}`;
|
|
510
|
+
}
|
|
511
|
+
return "Run command";
|
|
512
|
+
}
|
|
513
|
+
// Back-compat branch: write_file / ensure_symlink / any unknown-future
|
|
514
|
+
// kind renders via the pre-phase-18 verb+path form. Byte-identical so any
|
|
515
|
+
// existing `Update <path>` / `Create <path>` / `Keep <path>` assertion
|
|
516
|
+
// continues to pass (ROADMAP criterion 5).
|
|
517
|
+
const target = action.relativePath ?? action.absolutePath ?? "user-local config";
|
|
518
|
+
const verb = action.mode === "replace" ? "Update" : action.mode === "unchanged" ? "Keep" : "Create";
|
|
519
|
+
return `${verb} ${target}`;
|
|
395
520
|
}
|
|
396
521
|
function summarizeAppliedActions(prefix, actions) {
|
|
397
522
|
const changedCount = countChangedActions(actions);
|
|
@@ -585,4 +710,34 @@ class SetupCanceledError extends Error {
|
|
|
585
710
|
export function isSetupCanceledError(error) {
|
|
586
711
|
return error instanceof SetupCanceledError;
|
|
587
712
|
}
|
|
713
|
+
/**
|
|
714
|
+
* Phase 18 plan 03 (UX-02) — typed recoveryHint renderer.
|
|
715
|
+
*
|
|
716
|
+
* When an unknown error bubbles out of `executeSetupCommand`, callers pass
|
|
717
|
+
* it through this helper. If the error is a `DurableTruthCollisionError`
|
|
718
|
+
* (detected via the dual-package-hazard-safe `isDurableTruthCollisionError`
|
|
719
|
+
* predicate from `@gdh/core`), the structured `recoveryHint` is rendered
|
|
720
|
+
* to the provided stderr sink as a multi-line block. Non-matching errors
|
|
721
|
+
* are left untouched; the caller's existing generic failure branch then
|
|
722
|
+
* renders them normally.
|
|
723
|
+
*
|
|
724
|
+
* This lives here (not in `index.ts`) so the pre-flight matrix, the apply
|
|
725
|
+
* try/catch sweep, and the outer CLI catch share a single rendering.
|
|
726
|
+
*/
|
|
727
|
+
export function renderDurableTruthCollisionHint(error, stderr) {
|
|
728
|
+
if (!isDurableTruthCollisionError(error)) {
|
|
729
|
+
return false;
|
|
730
|
+
}
|
|
731
|
+
const hint = error.recoveryHint;
|
|
732
|
+
const lines = [
|
|
733
|
+
`GDH setup cannot continue: ${error.message}`,
|
|
734
|
+
``,
|
|
735
|
+
` Suggested fix: ${hint.summary}`,
|
|
736
|
+
` Run: ${hint.command}`,
|
|
737
|
+
...(hint.skillName !== null ? [` Skill: ${hint.skillName}`] : []),
|
|
738
|
+
``,
|
|
739
|
+
];
|
|
740
|
+
stderr.write(`${lines.join("\n")}`);
|
|
741
|
+
return true;
|
|
742
|
+
}
|
|
588
743
|
//# sourceMappingURL=setup.js.map
|