dev-cockpit 0.5.0 → 0.6.1

package/dist/commands/mount.d.ts

@@ -25,6 +25,25 @@ export interface MountCommandOptions {
     quiet?: boolean;
 }
 export declare function mergeMounts(configMounts: readonly Mount[], providerMounts: readonly Mount[]): Mount[];
+/**
+ * Seed the candidate list from the currently-applied manifest.
+ *
+ * Two jobs:
+ *   1. Manifest entries with no discovered/config counterpart (ad-hoc custom
+ *      mounts added via the picker's add-custom loop) are appended as
+ *      candidates — otherwise they'd be invisible on the next `mount` run and
+ *      silently dropped by any re-apply, with no way to toggle just one off.
+ *   2. Returns the applied-key set so the picker can pre-check exactly the
+ *      mounts that are currently applied (instead of pre-checking everything,
+ *      where an absent-minded ⏎ would apply mounts the user never had).
+ *
+ * `appliedKeys` is null when no manifest exists — first-run pickers keep the
+ * legacy default (everything matched pre-checked).
+ */
+export declare function seedCandidatesFromManifest(merged: readonly Mount[], manifestMounts: readonly Mount[] | null): {
+    candidates: Mount[];
+    appliedKeys: ReadonlySet<string> | null;
+};
 /**
  * Interactive picker. Lazy-imports @inquirer/prompts to keep the `dev`
  * command's startup time clean. Three phases:
@@ -39,7 +58,7 @@ export declare function mergeMounts(configMounts: readonly Mount[], providerMoun
  * Returns the final mount set in source-of-truth order. The caller writes
  * the overlay / manifest from this list.
  */
-export declare function pickMounts(candidates: readonly Mount[]): Promise<Mount[]>;
+export declare function pickMounts(candidates: readonly Mount[], appliedKeys?: ReadonlySet<string> | null): Promise<Mount[]>;
 export declare function mountCommand(opts?: MountCommandOptions): Promise<void>;
 export declare function mountStatusCommand(opts?: MountCommandOptions): Promise<void>;
 export declare function mountClearCommand(opts?: MountCommandOptions): Promise<void>;

package/dist/commands/mount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../src/commands/mount.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAoBvD,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAWD,wBAAgB,WAAW,CACzB,YAAY,EAAE,SAAS,KAAK,EAAE,EAC9B,cAAc,EAAE,SAAS,KAAK,EAAE,GAC/B,KAAK,EAAE,CAKT;AAsHD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,UAAU,CAAC,UAAU,EAAE,SAAS,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAqK/E;AAED,wBAAsB,YAAY,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6FhF;AAED,wBAAsB,kBAAkB,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoEtF;AAED,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCrF"}
+{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../src/commands/mount.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAoBvD,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAWD,wBAAgB,WAAW,CACzB,YAAY,EAAE,SAAS,KAAK,EAAE,EAC9B,cAAc,EAAE,SAAS,KAAK,EAAE,GAC/B,KAAK,EAAE,CAKT;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,KAAK,EAAE,EACxB,cAAc,EAAE,SAAS,KAAK,EAAE,GAAG,IAAI,GACtC;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;CAAE,CAUlE;AAsHD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,UAAU,CAC9B,UAAU,EAAE,SAAS,KAAK,EAAE,EAC5B,WAAW,GAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAW,GAC7C,OAAO,CAAC,KAAK,EAAE,CAAC,CA6KlB;AAED,wBAAsB,YAAY,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwGhF;AAED,wBAAsB,kBAAkB,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoEtF;AAED,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCrF"}

package/dist/health/predicates/composer-drift.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"composer-drift.d.ts","sourceRoot":"","sources":["../../../src/health/predicates/composer-drift.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAoBD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,aAAa,EAClB,IAAI,GAAE,yBAA8B,GACnC,OAAO,CAAC,YAAY,CAAC,CA0CvB;AAeD,MAAM,WAAW,+BAAgC,SAAQ,yBAAyB;IAChF,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CAC1C;AAED,wBAAgB,wBAAwB,CACtC,IAAI,GAAE,+BAAoC,GACzC,WAAW,CAiBb"}
+{"version":3,"file":"composer-drift.d.ts","sourceRoot":"","sources":["../../../src/health/predicates/composer-drift.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAoBD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,aAAa,EAClB,IAAI,GAAE,yBAA8B,GACnC,OAAO,CAAC,YAAY,CAAC,CA0CvB;AAeD,MAAM,WAAW,+BAAgC,SAAQ,yBAAyB;IAChF,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CAC1C;AAED,wBAAgB,wBAAwB,CACtC,IAAI,GAAE,+BAAoC,GACzC,WAAW,CA4Bb"}

package/dist/health/remediations.d.ts

@@ -24,4 +24,15 @@ export declare function runRemediation(key: RemediationKey, checks: HealthCheck[
  */
 export declare function findRemediation(key: RemediationKey, checks: HealthCheck[]): HealthCheck | undefined;
 export declare function dispatchRemediation(remediation: Remediation, ctx: HealthContext, workspaceRoot: string, sourceId: string): Promise<void>;
+/**
+ * Run a single command, streaming its stdout/stderr into the health output log
+ * under `health:<sourceId>`. Resolves with the process exit code once it exits.
+ *
+ * Shared by the `command`-shape dispatcher above and by `run`-shape
+ * remediations that need to invoke one or more commands with a proper per-call
+ * `cwd` (e.g. `composer install` in several package dirs). Keeping this the one
+ * way a remediation reaches a subprocess means commands stay plain argv — no
+ * shell string is ever parsed, so `&&` / `(cd …)` can't leak into argv.
+ */
+export declare function streamCommand(ctx: HealthContext, sourceId: string, program: string, args: string[], cwd: string): Promise<number>;
 //# sourceMappingURL=remediations.d.ts.map

package/dist/health/remediations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remediations.d.ts","sourceRoot":"","sources":["../../src/health/remediations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE1E,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,WAAW,EAAE,EACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACrC,WAAW,EAAE,CASf;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAevE;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,WAAW,EAAE,EACrB,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACrC,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,WAAW,EAAE,GACpB,WAAW,GAAG,SAAS,CAEzB;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAiCf"}
+{"version":3,"file":"remediations.d.ts","sourceRoot":"","sources":["../../src/health/remediations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE1E,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,WAAW,EAAE,EACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACrC,WAAW,EAAE,CASf;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAevE;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,WAAW,EAAE,EACrB,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACrC,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,WAAW,EAAE,GACpB,WAAW,GAAG,SAAS,CAEzB;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,CAoBjB"}

package/dist/index.js

@@ -88257,6 +88257,9 @@ async function dispatchRemediation(remediation, ctx, workspaceRoot, sourceId) {
   if (!program2) return;
   const args = parts.slice(1);
   const cwd = remediation.cwd ?? workspaceRoot;
+  await streamCommand(ctx, sourceId, program2, args, cwd);
+}
+async function streamCommand(ctx, sourceId, program2, args, cwd) {
   const handle = spawnStream(program2, args, {
     cwd,
     onStdout: (line2) => ctx.appendOutput?.({
@@ -88272,7 +88275,7 @@ async function dispatchRemediation(remediation, ctx, workspaceRoot, sourceId) {
       text: line2
     })
   });
-  await handle.exitCode;
+  return handle.exitCode;
 }
 
 // src/health/notify-resolver.ts
@@ -91186,17 +91189,29 @@ function status3(severity, detail) {
 }
 function createComposerDriftCheck(opts = {}) {
   const dirs = opts.packageDirs ?? ["."];
-  const defaultCommand = dirs.map((d) => d === "" || d === "." ? "composer install" : `(cd ${d} && composer install)`).join(" && ");
+  const id = opts.id ?? "composer-drift";
   return {
-    id: opts.id ?? "composer-drift",
+    id,
     label: opts.label ?? "Composer",
     severity: opts.severity ?? "error",
     triggers: opts.triggers ?? ["startup", "lockfile"],
     predicate: (ctx) => checkComposerDrift(ctx, opts),
+    // Run `composer install` once per package dir, each in its own cwd. A
+    // declarative `command` string can't express this without shell syntax
+    // (`&&`, `(cd …)`), and the dispatcher runs commands as plain argv — so
+    // that syntax would reach composer as bogus package arguments. The `run`
+    // shape keeps each invocation a clean argv in the right directory and
+    // short-circuits on the first failure, mirroring `&&`.
     remediation: opts.remediation ?? {
       key: "R",
       label: "Run composer install",
-      command: defaultCommand
+      run: async (ctx, workspaceRoot) => {
+        for (const d of dirs) {
+          const cwd = d === "" || d === "." ? workspaceRoot : path15.join(workspaceRoot, d);
+          const code = await streamCommand(ctx, id, "composer", ["install"], cwd);
+          if (code !== 0) break;
+        }
+      }
     }
   };
 }
@@ -93157,6 +93172,17 @@ function mergeMounts(configMounts, providerMounts) {
   for (const m of configMounts) seen.set(mountKey(m), m);
   return Array.from(seen.values());
 }
+function seedCandidatesFromManifest(merged, manifestMounts) {
+  if (manifestMounts === null) {
+    return { candidates: [...merged], appliedKeys: null };
+  }
+  const mergedKeys = new Set(merged.map(mountKey));
+  const extras = manifestMounts.filter((m) => !mergedKeys.has(mountKey(m)));
+  return {
+    candidates: [...merged, ...extras],
+    appliedKeys: new Set(manifestMounts.map(mountKey))
+  };
+}
 async function resolveContext(opts) {
   const profile = opts.profile;
   let configPath;
@@ -93243,18 +93269,19 @@ async function pickSourceForMount(m, prompts) {
     validate: (v) => v.trim().length > 0 && path24.isAbsolute(v.trim()) ? true : "must be an absolute path"
   })).trim();
 }
-async function pickMounts(candidates) {
+async function pickMounts(candidates, appliedKeys = null) {
   const { checkbox, confirm, input, select } = await import("@inquirer/prompts");
   const prompts = { select, input };
   let selected = [];
   if (candidates.length > 0) {
     const choices = candidates.map((m) => {
       const unmatched = isUnmatched(m);
-      const suffix = unmatched ? "  (no source found \u2014 pick one)" : `  ${m.hostPath}`;
+      const applied = appliedKeys?.has(mountKey(m)) ?? false;
+      const suffix = unmatched ? "  (no source found \u2014 pick one)" : `  ${m.hostPath}${applied ? "  [applied]" : ""}`;
       return {
         name: `${mountLabel(m)}${suffix}`,
         value: m,
-        checked: !unmatched
+        checked: !unmatched && (appliedKeys ? applied : true)
       };
     });
     selected = await checkbox({ message: "Select mounts to apply:", choices });
@@ -93377,26 +93404,32 @@ async function mountCommand(opts = {}) {
     profile
   } = ctx;
   const merged = mergeMounts(configMounts, providerMounts);
+  let manifestMounts = null;
+  try {
+    manifestMounts = readMountManifest(manifestPath2)?.mounts ?? null;
+  } catch {
+  }
+  const { candidates, appliedKeys } = seedCandidatesFromManifest(merged, manifestMounts);
   let selected;
   if (opts.quiet || configMounts.length > 0 && providerMounts.length === 0) {
-    if (merged.length === 0) {
+    if (candidates.length === 0) {
       process.stdout.write(
         "dev-cockpit mount: no mount candidates from config.mounts[] or profile.mountCandidatesProvider.\n"
       );
       return;
     }
-    selected = merged;
+    selected = candidates;
     if (opts.quiet) {
       process.stdout.write(`dev-cockpit mount: applying all ${selected.length} candidate(s).
 `);
     }
   } else {
-    if (merged.length === 0) {
+    if (candidates.length === 0) {
       process.stdout.write(
         "dev-cockpit mount: no mount candidates discovered. You can add custom mounts interactively below, or Ctrl-C to bail.\n"
       );
     }
-    selected = await pickMounts(merged);
+    selected = await pickMounts(candidates, appliedKeys);
     if (selected.length === 0) {
       process.stdout.write("dev-cockpit mount: nothing selected; nothing to apply.\n");
       return;