@deeeed/metamask-harness 0.17.3 → 0.17.5

package/dist/commands/launch/index.js

@@ -7,7 +7,6 @@ import { recipeRuntimePath, runnerDir } from "../../paths.js";
 import { getAdapterSurface } from "../../adapters/surface.js";
 import {
   ADAPTER_DETECT_NEXT,
-  checkoutBusyOut,
   EXIT,
   flag,
   parseFlags,
@@ -15,8 +14,7 @@ import {
   spawnScript,
   str,
   targetOf,
-  usageOut,
-  writeInteractiveProgress
+  usageOut
 } from "../shared.js";
 import {
   RECOVERY_CODE,
@@ -34,8 +32,6 @@ import {
 import { launchMobile } from "./mobile.js";
 import { applyDeviceTargeting } from "../device-target.js";
 import { acquireCheckoutLock } from "../../checkout-lock.js";
-import { JsonStreamWriter } from "../../json-stream.js";
-import { ensureExtensionConsoleCapture } from "../../adapters/extension/console-capture.js";
 const LAUNCH_BOOLEANS = /* @__PURE__ */ new Set([
   "build",
   "watch",
@@ -43,58 +39,30 @@ const LAUNCH_BOOLEANS = /* @__PURE__ */ new Set([
   "sidepanel",
   "fullscreen",
   "runway",
-  "json",
-  "jsonStream"
+  "json"
 ]);
 const DEFAULT_EXTENSION_DAPP_URL = "https://metamask.github.io/test-dapp/";
 async function handleLaunch(argv) {
   const { options } = parseFlags(argv, LAUNCH_BOOLEANS);
   const json = flag(options, "json");
-  const stream = new JsonStreamWriter("launch", flag(options, "jsonStream"));
-  const jsonOutput = json && !stream.enabled;
-  const restoreStdout = stream.isolateStdout();
   const target = targetOf(options);
+  if (!fs.existsSync(target)) return handleLaunchLocked(argv);
+  const lock = acquireCheckoutLock(target, "launch");
+  if ("message" in lock) {
+    return usageOut(json, "launch", lock.message, `wait for the current owner, or inspect ${lock.path} if its process has exited`);
+  }
   try {
-    let exitCode;
-    if (!fs.existsSync(target)) {
-      exitCode = await handleLaunchLocked(argv, stream);
-    } else {
-      const lock = acquireCheckoutLock(target, "launch");
-      if ("message" in lock) {
-        const userAction = `wait for the current owner, or inspect ${lock.path} if its process has exited`;
-        stream.error({ code: "SANDBOX_BUSY", message: lock.message, userAction });
-        exitCode = checkoutBusyOut(jsonOutput, "launch", lock.message, lock.path);
-      } else {
-        try {
-          exitCode = await handleLaunchLocked(argv, stream);
-        } finally {
-          lock.release();
-        }
-      }
-    }
-    stream.complete(exitCode === EXIT.ok ? "pass" : "fail", exitCode);
-    return exitCode;
-  } catch (error) {
-    const exitCode = error !== null && typeof error === "object" && "exitCode" in error && typeof error.exitCode === "number" ? error.exitCode : EXIT.runtime;
-    stream.error({
-      code: exitCode === EXIT.usage ? "CLI_USAGE_ERROR" : "LAUNCH_FAILED",
-      message: error instanceof Error ? error.message : String(error),
-      userAction: `mm-harness doctor --target ${shellQuote(target)} --json`
-    });
-    stream.complete("fail", exitCode);
-    throw error;
+    return await handleLaunchLocked(argv);
   } finally {
-    restoreStdout();
+    lock.release();
   }
 }
-async function handleLaunchLocked(argv, stream) {
+async function handleLaunchLocked(argv) {
   const { positional, options } = parseFlags(argv, LAUNCH_BOOLEANS);
   const json = flag(options, "json");
-  const jsonOutput = json && !stream.enabled;
-  const machine = json || stream.enabled;
   const target = targetOf(options);
   const heal = parseHeal(options, "auto");
-  if (typeof heal !== "string") return launchUsage(jsonOutput, stream, heal.error, "use --heal off|infra-only|auto");
+  if (typeof heal !== "string") return usageOut(json, "launch", heal.error, "use --heal off|infra-only|auto");
   const posToken = positional[0];
   const mobileTargetToken = posToken === "ios" || posToken === "android" ? posToken : void 0;
   const platformFlag = str(options, "platform");
@@ -103,16 +71,15 @@ async function handleLaunchLocked(argv, stream) {
   const adapterHint = mobileTarget ? "mobile" : void 0;
   const adapter = resolveAdapter(options, target, adapterHint);
   if (!adapter) {
-    return launchUsage(jsonOutput, stream, `could not detect the MetaMask repo type for ${target}`, ADAPTER_DETECT_NEXT);
+    return usageOut(json, "launch", `could not detect the MetaMask repo type for ${target}`, ADAPTER_DETECT_NEXT);
   }
-  stream.phase("resolve", { target, adapter, platform: mobileTarget ?? null });
   if (adapter === "core") {
-    return launchUsage(jsonOutput, stream, "core is headless; there is nothing to launch.", "mm-harness verify");
+    return usageOut(json, "launch", "core is headless; there is nothing to launch.", "mm-harness verify");
   }
   if (adapter === "mobile" && !mobileTarget) {
-    return launchUsage(
-      jsonOutput,
-      stream,
+    return usageOut(
+      json,
+      "launch",
       "target is required for mobile.",
       "mm-harness launch ios   or   mm-harness launch android"
     );
@@ -122,15 +89,15 @@ async function handleLaunchLocked(argv, stream) {
   const wantWatch = flag(options, "watch");
   const wantRunway = flag(options, "runway");
   if (wantRunway && adapter !== "mobile") {
-    return launchUsage(jsonOutput, stream, "runway is mobile-only.", "drop --runway for the extension");
+    return usageOut(json, "launch", "runway is mobile-only.", "drop --runway for the extension");
   }
   const displayMode = flag(options, "sidepanel") && !flag(options, "fullscreen") ? "sidepanel" : "fullscreen";
   for (const portFlag of ["cdpPort", "watcherPort"]) {
     const value = str(options, portFlag);
     if (value !== void 0 && !/^\d+$/u.test(value)) {
-      return launchUsage(
-        jsonOutput,
-        stream,
+      return usageOut(
+        json,
+        "launch",
         `--${portFlag === "cdpPort" ? "cdp-port" : "watcher-port"} must be numeric (got: ${value}).`,
         `pass a numeric port, e.g. --${portFlag === "cdpPort" ? "cdp-port 6663" : "watcher-port 8081"}`
       );
@@ -138,7 +105,7 @@ async function handleLaunchLocked(argv, stream) {
   }
   const envResult = applyLaunchEnvOverrides(options, adapter, mobileTarget, target);
   if (envResult && "code" in envResult) {
-    return launchUsage(jsonOutput, stream, envResult.message, envResult.userAction);
+    return usageOut(json, "launch", envResult.message, "mm-harness launch android --device <adb-serial|device-name>");
   }
   const tier = wantBuild ? "build" : "quick";
   if (adapter === "extension") {
@@ -147,55 +114,44 @@ async function handleLaunchLocked(argv, stream) {
       process.env.EXTENSION_START_URL = requestedUrl || DEFAULT_EXTENSION_DAPP_URL;
     }
   }
-  if (!machine && adapter === "extension") {
+  if (!json && adapter === "extension") {
     const modeNote = displayMode === "sidepanel" ? `sidepanel \xB7 dapp ${process.env.EXTENSION_START_URL ?? DEFAULT_EXTENSION_DAPP_URL}` : "fullscreen";
     const workNote = wantWatch ? "watch only" : tier === "build" ? "clean build" : "quick reuse probe";
     console.error(
       `\u2192 extension launch \u2014 ${modeNote} \xB7 CDP :${process.env.CDP_PORT ?? "default"} \xB7 ${workNote}`
     );
   }
-  if (adapter === "mobile") {
-    const device = str(options, "device") ?? (mobileTarget === "android" ? process.env.ADB_SERIAL ?? process.env.ANDROID_SERIAL : process.env.IOS_SIMULATOR ?? process.env.SIM_UDID) ?? "configured device";
-    const watcherPort = str(options, "watcherPort") ?? process.env.WATCHER_PORT ?? "auto";
-    writeInteractiveProgress(
-      machine,
-      `\u2192 mobile launch \u2014 ${mobileTarget} \xB7 ${tier === "build" ? "native build" : "quick readiness"} \xB7 ${device} \xB7 Metro ${watcherPort === "auto" ? "auto" : `:${watcherPort}`}`
-    );
-  }
   const state = newHealState();
   if (tier === "quick" && nativeInputsChanged(target, adapter)) {
-    return launchUsage(
-      jsonOutput,
-      stream,
+    return usageOut(
+      json,
+      "launch",
       "native build inputs changed since last build.",
       `mm-harness launch ${adapter === "mobile" ? `${mobileTarget} ` : ""}--build`
     );
   }
-  stream.phase("install");
-  const ensured = await ensureOverlay(adapter, target, heal, state, machine);
+  const ensured = await ensureOverlay(adapter, target, heal, state, json);
   if (!ensured.ok) {
-    return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+    return launchFail(json, adapter, mobileTarget, tier, state, {
       code: "OVERLAY_INSTALL_FAILED",
       message: ensured.error ?? "overlay install failed",
       recoverable: false,
       exitCode: EXIT.infra
     });
   }
-  stream.phase("healthcheck");
   if (adapter === "extension") {
     const willBuild = wantWatch || tier === "build" || !await extensionRuntimeReusable(target);
     if (willBuild) {
       const depsBlock = extensionDepsBlock(target);
       if (depsBlock) {
         if (heal === "off") {
-          return launchUsage(jsonOutput, stream, depsBlock.message, depsBlock.userAction);
+          return usageOut(json, "launch", depsBlock.message, depsBlock.userAction);
         }
         const recoveryCode2 = "deps.installed";
         state.attemptedRecoveries.push(recoveryCode2);
-        stream.phase("recover");
         const repaired = await installExtensionDeps(target);
         if (repaired.status !== 0 || extensionDepsBlock(target)) {
-          return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+          return launchFail(json, adapter, mobileTarget, tier, state, {
             code: "DEPENDENCY_INSTALL_FAILED",
             message: depsBlock.message,
             recoverable: false,
@@ -209,13 +165,12 @@ async function handleLaunchLocked(argv, stream) {
       }
     }
   }
-  stream.phase("launch");
-  let attempt = await executeComposition(adapter, mobileTarget, tier, wantWatch, target, machine, displayMode);
+  let attempt = await executeComposition(adapter, mobileTarget, tier, wantWatch, target, json, displayMode);
   if (attempt.status === 0) {
-    return await finishLaunch(jsonOutput, machine, stream, adapter, mobileTarget, tier, displayMode, target, state, wantWatch, wantVerify);
+    return await finishLaunch(json, adapter, mobileTarget, tier, displayMode, target, state, wantWatch, wantVerify);
   }
   if (heal === "off") {
-    return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+    return launchFail(json, adapter, mobileTarget, tier, state, {
       code: "LAUNCH_FAILED",
       message: `launch ${adapter}${mobileTarget ? ` ${mobileTarget}` : ""} failed (healing off)`,
       recoverable: false,
@@ -225,13 +180,12 @@ async function handleLaunchLocked(argv, stream) {
   if (adapter === "extension" && tier === "quick" && extensionQuickReattachFailed(attempt.output)) {
     const recoveryCode2 = "chrome.relaunched";
     state.attemptedRecoveries.push(recoveryCode2);
-    stream.phase("recover");
-    const rebuildAttempt = await executeComposition(adapter, mobileTarget, "build", wantWatch, target, machine, displayMode);
+    const rebuildAttempt = await executeComposition(adapter, mobileTarget, "build", wantWatch, target, json, displayMode);
     if (rebuildAttempt.status === 0) {
       state.recovered.push(recoveryCode2);
-      return await finishLaunch(jsonOutput, machine, stream, adapter, mobileTarget, tier, displayMode, target, state, wantWatch, wantVerify);
+      return await finishLaunch(json, adapter, mobileTarget, tier, displayMode, target, state, wantWatch, wantVerify);
     }
-    return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+    return launchFail(json, adapter, mobileTarget, tier, state, {
       code: "EXTENSION_RELAUNCH_FAILED",
       message: "quick reattach failed, and clean relaunch failed too.",
       recoverable: false,
@@ -240,7 +194,7 @@ async function handleLaunchLocked(argv, stream) {
     });
   }
   if (adapter === "mobile" && mobileProvisioningBlocked(attempt.output)) {
-    return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+    return launchFail(json, adapter, mobileTarget, tier, state, {
       code: "MOBILE_PROVISION_REQUIRED",
       message: `mobile ${mobileTarget ?? "runtime"} is not provisioned for this slot.`,
       recoverable: false,
@@ -251,7 +205,7 @@ async function handleLaunchLocked(argv, stream) {
   }
   const bound = checkHealBounds(target, attempt.output, state);
   if (bound !== null) {
-    return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+    return launchFail(json, adapter, mobileTarget, tier, state, {
       code: bound.code,
       message: bound.message,
       recoverable: false,
@@ -262,13 +216,12 @@ async function handleLaunchLocked(argv, stream) {
   }
   const recoveryCode = RECOVERY_CODE[adapter];
   state.attemptedRecoveries.push(recoveryCode);
-  stream.phase("recover");
-  attempt = await executeComposition(adapter, mobileTarget, tier, wantWatch, target, machine, displayMode);
+  attempt = await executeComposition(adapter, mobileTarget, tier, wantWatch, target, json, displayMode);
   if (attempt.status === 0) {
     state.recovered.push(recoveryCode);
-    return await finishLaunch(jsonOutput, machine, stream, adapter, mobileTarget, tier, displayMode, target, state, wantWatch, wantVerify);
+    return await finishLaunch(json, adapter, mobileTarget, tier, displayMode, target, state, wantWatch, wantVerify);
   }
-  return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+  return launchFail(json, adapter, mobileTarget, tier, state, {
     code: "SAME_RECOVERY_TWICE",
     message: `launch ${adapter}${mobileTarget ? ` ${mobileTarget}` : ""} failed again after ${recoveryCode} recovery \u2014 refusing to loop.`,
     recoverable: false,
@@ -321,16 +274,14 @@ function applyLaunchEnvOverrides(options, adapter, mobileTarget, target) {
       return {
         ok: false,
         code: "DEVICE_WRONG_PLATFORM",
-        message: `--device ${device} did not resolve to an Android device for launch android.`,
-        userAction: `mm-harness status --target ${shellQuote(target)} --all-devices --json`
+        message: `--device ${device} did not resolve to an Android device for launch android.`
       };
     }
     if (mobileTarget === "ios" && device && !process.env.IOS_SIMULATOR) {
       return {
         ok: false,
         code: "DEVICE_WRONG_PLATFORM",
-        message: `--device ${device} did not resolve to an iOS simulator for launch ios.`,
-        userAction: `mm-harness status --target ${shellQuote(target)} --all-devices --json`
+        message: `--device ${device} did not resolve to an iOS simulator for launch ios.`
       };
     }
   }
@@ -376,29 +327,26 @@ async function executeComposition(adapter, mobileTarget, tier, wantWatch, target
   }
   return launchExtension(target, tier, wantWatch, displayMode);
 }
-async function finishLaunch(jsonOutput, machine, stream, adapter, mobileTarget, tier, displayMode, target, state, wantWatch, wantVerify, sidepanelRecoveryAllowed = true) {
+async function finishLaunch(json, adapter, mobileTarget, tier, displayMode, target, state, wantWatch, wantVerify, sidepanelRecoveryAllowed = true) {
   if (adapter === "extension" && displayMode === "sidepanel") {
     const sidepanelSh = path.join(runnerDir, "adapters/extension/sidepanel-toggle.sh");
     const sidepanelArgs = ["open"];
     if (process.env.CDP_PORT) sidepanelArgs.push("--cdp-port", process.env.CDP_PORT);
-    if (!machine) {
+    if (!json) {
       console.error(
         `[sidepanel] opening panel beside ${process.env.EXTENSION_START_URL ?? DEFAULT_EXTENSION_DAPP_URL}`
       );
     }
-    const sidepanel = spawnScript(sidepanelSh, sidepanelArgs, target, machine, { REPO: target });
+    const sidepanel = spawnScript(sidepanelSh, sidepanelArgs, target, json, { REPO: target });
     if (sidepanel.status !== 0) {
       const recoveryCode = "chrome.relaunched";
       if (sidepanelRecoveryAllowed && tier === "quick" && extensionRuntimeBlocked(sidepanel.output) && !state.attemptedRecoveries.includes(recoveryCode)) {
         state.attemptedRecoveries.push(recoveryCode);
-        stream.phase("recover");
-        const rebuildAttempt = await executeComposition(adapter, mobileTarget, "build", wantWatch, target, machine, displayMode);
+        const rebuildAttempt = await executeComposition(adapter, mobileTarget, "build", wantWatch, target, json, displayMode);
         if (rebuildAttempt.status === 0) {
           state.recovered.push(recoveryCode);
           return await finishLaunch(
-            jsonOutput,
-            machine,
-            stream,
+            json,
             adapter,
             mobileTarget,
             tier,
@@ -410,7 +358,7 @@ async function finishLaunch(jsonOutput, machine, stream, adapter, mobileTarget,
             false
           );
         }
-        return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+        return launchFail(json, adapter, mobileTarget, tier, state, {
           code: "EXTENSION_RELAUNCH_FAILED",
           message: "sidepanel open found a blocked extension runtime, and clean relaunch failed too.",
           recoverable: false,
@@ -418,7 +366,7 @@ async function finishLaunch(jsonOutput, machine, stream, adapter, mobileTarget,
           originalError: rebuildAttempt.output.trim() || void 0
         });
       }
-      return launchFail(jsonOutput, stream, adapter, mobileTarget, tier, state, target, {
+      return launchFail(json, adapter, mobileTarget, tier, state, {
         code: "SIDEPANEL_OPEN_FAILED",
         message: "app launched but opening the side panel failed.",
         recoverable: false,
@@ -428,48 +376,16 @@ async function finishLaunch(jsonOutput, machine, stream, adapter, mobileTarget,
       });
     }
   }
-  if (adapter === "extension") {
-    try {
-      await ensureExtensionConsoleCapture(target);
-    } catch (error) {
-      if (!machine) {
-        console.error(`WARN: Extension console capture unavailable: ${error instanceof Error ? error.message : String(error)}`);
-      }
-    }
-  }
   if (wantVerify) {
-    stream.phase("verify");
     const verifyArgs = ["verify", "--adapter", adapter, "--target", target];
     if (adapter === "mobile" && mobileTarget) verifyArgs.push("--platform", mobileTarget);
-    if (machine) verifyArgs.push("--json");
-    const exitCode = await handleHarness(verifyArgs);
-    if (stream.enabled) {
-      for (const mutation of state.mutations) stream.mutation(mutation);
-      for (const recovery of state.recovered) stream.recovery(recovery);
-      stream.complete(exitCode === EXIT.ok ? "pass" : "fail", exitCode, {
-        adapter,
-        platform: mobileTarget ?? (adapter === "extension" ? displayMode : null),
-        tier,
-        recovered: state.recovered,
-        mutations: state.mutations
-      });
-    }
-    return exitCode;
+    if (json) verifyArgs.push("--json");
+    return handleHarness(verifyArgs);
   }
-  return launchPass(jsonOutput, stream, adapter, mobileTarget, tier, displayMode, state);
+  return launchPass(json, adapter, mobileTarget, tier, displayMode, state);
 }
-function launchPass(json, stream, adapter, mobileTarget, tier, displayMode, state) {
-  if (stream.enabled) {
-    for (const mutation of state.mutations) stream.mutation(mutation);
-    for (const recovery of state.recovered) stream.recovery(recovery);
-    stream.complete("pass", EXIT.ok, {
-      adapter,
-      platform: mobileTarget ?? (adapter === "extension" ? displayMode : null),
-      tier,
-      recovered: state.recovered,
-      mutations: state.mutations
-    });
-  } else if (json) {
+function launchPass(json, adapter, mobileTarget, tier, displayMode, state) {
+  if (json) {
     console.log(
       JSON.stringify(
         {
@@ -507,32 +423,8 @@ function launchDeviceLabel(mobileTarget) {
   }
   return process.env.IOS_SIMULATOR || process.env.ADB_SERIAL || "booted device";
 }
-function launchUsage(json, stream, message, userAction) {
-  stream.error({ code: "USAGE", message, userAction });
-  return usageOut(json, "launch", message, userAction);
-}
-function launchFail(json, stream, adapter, mobileTarget, tier, state, target, failure) {
-  const userAction = failure.userAction ?? `mm-harness doctor --fix --adapter ${adapter} --target ${shellQuote(target)} --json`;
-  if (stream.enabled) {
-    for (const mutation of state.mutations) stream.mutation(mutation);
-    for (const recovery of state.recovered) stream.recovery(recovery);
-    stream.error({
-      code: failure.code,
-      message: failure.message,
-      retryable: failure.recoverable,
-      userAction,
-      originalError: failure.originalError ?? null
-    });
-    stream.complete("fail", failure.exitCode, {
-      adapter,
-      platform: mobileTarget ?? null,
-      tier,
-      recovered: state.recovered,
-      mutations: state.mutations,
-      recoverable: failure.recoverable,
-      attemptedRecoveries: state.attemptedRecoveries
-    });
-  } else if (json) {
+function launchFail(json, adapter, mobileTarget, tier, state, failure) {
+  if (json) {
     console.log(
       JSON.stringify(
         {
@@ -552,7 +444,7 @@ function launchFail(json, stream, adapter, mobileTarget, tier, state, target, fa
             code: failure.code,
             message: failure.message,
             retryable: failure.recoverable,
-            userAction,
+            userAction: failure.userAction ?? null,
             originalError: failure.originalError ?? null
           }
         },
@@ -565,8 +457,8 @@ function launchFail(json, stream, adapter, mobileTarget, tier, state, target, fa
       `\u2717 launch ${adapter}${mobileTarget ? ` ${mobileTarget}` : ""} failed
   ${failure.message}` + (failure.originalError ? `
   --- original failure ---
-${failure.originalError}` : "") + `
-  Next: ${userAction}`
+${failure.originalError}` : "") + (failure.userAction ? `
+  Next: ${failure.userAction}` : "")
     );
   }
   return failure.exitCode;

package/dist/commands/logs.js

@@ -19,10 +19,9 @@ async function handleLogs(argv) {
   const logSources = surface.logSources(target);
   const appLogSource = surface.appLogSource(target);
   const sourceLabels = logSources.map((entry) => entry.label);
-  const appSourceLabel = appLogSource?.label ?? "app";
-  const defaultSource = appLogSource && appSourceLabel !== "app" ? appSourceLabel : sourceLabels[0];
+  const defaultSource = sourceLabels[0];
   const source = str(options, "source") ?? defaultSource;
-  const validSources = [...sourceLabels, ...appLogSource ? [appSourceLabel] : [], ...appLogSource && appSourceLabel !== "app" ? ["app"] : []];
+  const validSources = [...sourceLabels, ...appLogSource ? ["app"] : []];
   if (!validSources.includes(source)) {
     return usageOut(json, "logs", `--source must be one of: ${validSources.join(", ")}.`, `mm-harness logs --source ${defaultSource}`);
   }
@@ -33,12 +32,11 @@ async function handleLogs(argv) {
     }
     process.env.RECIPE_LOG_EVENTS = events;
   }
-  const isAppSource = source === "app" || source === appSourceLabel;
-  const requested = isAppSource ? appLogSource : logSources.find((entry) => entry.label === source);
-  const ordered = isAppSource ? requested ? [requested] : [] : requested ? [requested] : logSources;
+  const requested = source === "app" ? appLogSource : logSources.find((entry) => entry.label === source);
+  const ordered = source === "app" ? requested ? [requested] : [] : requested ? [requested, ...logSources.filter((entry) => entry !== requested)] : logSources;
   const logFile = ordered.find((entry) => fs.existsSync(entry.path))?.path;
   if (!logFile) {
-    if (isAppSource && appLogSource) {
+    if (source === "app" && appLogSource) {
       const message = `application console unavailable for this checkout (${path.basename(appLogSource.path)} is absent).`;
       const userAction = surface.hints.launch;
       if (json) {
@@ -57,7 +55,7 @@ async function handleLogs(argv) {
       }
       return EXIT.runtime;
     }
-    const names = isAppSource && appLogSource ? path.basename(appLogSource.path) : logSources.map((entry) => path.basename(entry.path)).join(" / ");
+    const names = source === "app" && appLogSource ? path.basename(appLogSource.path) : logSources.map((entry) => path.basename(entry.path)).join(" / ");
     return usageOut(
       json,
       "logs",