adb-ready 0.1.1 → 0.1.2

package/CHANGELOG.md

@@ -9,6 +9,26 @@ breaking changes.
 
 ## [Unreleased]
 
+## [0.1.2] - 2026-09-10
+
+### Changed
+
+- Start live log streams at the current buffer position by default, while
+  keeping explicit history available through `--tail`, `--since`, and `--dump`.
+- Color live logcat and child output by parsed severity and conservative message
+  semantics without treating every `stderr` line as an error.
+- Present a safely handled `Ctrl-C` as an interruption while preserving exit
+  code 130 and a failed machine result for automation.
+
+### Fixed
+
+- Correlate duplicate ADB 37 mDNS service-name and stable endpoint transports
+  only when exact discovery and observed hardware identity prove they match.
+- Prevent port-list results from being misclassified as saved-session results in
+  human and plain output.
+- Emit saved session timelines as one event per NDJSON line followed by a compact
+  result summary instead of duplicating the complete event array.
+
 ## [0.1.1] - 2026-09-10
 
 ### Fixed
@@ -32,6 +52,7 @@ breaking changes.
   explainable configuration precedence.
 - Human, plain, JSON, and NDJSON output across Node, Bun, and Deno entrypoints.
 
-[Unreleased]: https://github.com/Adam014/adb-ready/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/Adam014/adb-ready/compare/v0.1.2...HEAD
+[0.1.2]: https://github.com/Adam014/adb-ready/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/Adam014/adb-ready/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/Adam014/adb-ready/compare/v0.0.1-alpha.0...v0.1.0

package/README.md

@@ -195,7 +195,7 @@ Android transport backend.
 [Changelog](./CHANGELOG.md) · [Contributing](./CONTRIBUTING.md) ·
 [Security](./SECURITY.md) · [MIT License](./LICENSE)
 
-ADB Ready is Android-only. The `0.1.0` release focuses on target acquisition,
+ADB Ready is Android-only. The `0.1.x` releases focus on target acquisition,
 ports, development-session recovery, logs, diagnostics, and automation. App
 lifecycle, files, screenshots, screen recording, and shell workflows come
 after this core is proven on real projects.

package/dist/cli.js

@@ -9,7 +9,7 @@ import process9 from "node:process";
 // package.json
 var package_default = {
   name: "adb-ready",
-  version: "0.1.1",
+  version: "0.1.2",
   description: "Make an Android target ready, then keep the development session working.",
   private: false,
   type: "module",
@@ -1555,9 +1555,10 @@ function targetInventoryProblems(targets, correlation) {
   const problems = [];
   for (const target of targets) {
     const serialCounts = new Map;
+    const hasStableTransport = target.transports.some(({ stable }) => stable);
     for (const transport of target.transports) {
       serialCounts.set(transport.serial, (serialCounts.get(transport.serial) ?? 0) + 1);
-      if (!transport.stable) {
+      if (!transport.stable && !hasStableTransport) {
         problems.push({
           code: ProblemCode.UnstableTargetSerial,
           category: "target.identity",
@@ -2711,6 +2712,44 @@ function isStableAdbSerial(serial) {
   }
   return true;
 }
+function normalizedServiceSerial(value) {
+  return value.trim().replace(/\.+$/u, "");
+}
+function serviceSerial(service) {
+  return normalizedServiceSerial(`${service.instance}.${service.rawServiceType}`);
+}
+function correlateMdnsTransportIdentities(observations, services) {
+  const identityByEndpoint = new Map;
+  for (const observation of observations) {
+    const hardwareSerial = observation.hardwareSerial?.trim();
+    const endpoint = parseAdbNetworkEndpoint(observation.device.serial);
+    if (hardwareSerial === undefined || hardwareSerial === "" || endpoint === undefined)
+      continue;
+    const identities = identityByEndpoint.get(endpoint.serial) ?? new Set;
+    identities.add(hardwareSerial);
+    identityByEndpoint.set(endpoint.serial, identities);
+  }
+  return observations.map((observation) => {
+    if (observation.hardwareSerial !== undefined || !isMdnsServiceSerial(observation.device.serial)) {
+      return observation;
+    }
+    const matchingServices = services.filter((service) => serviceSerial(service) === normalizedServiceSerial(observation.device.serial));
+    const identities = new Set;
+    for (const service of matchingServices) {
+      const advertisedIdentity = service.hardwareSerial?.trim();
+      if (advertisedIdentity !== undefined && advertisedIdentity !== "") {
+        identities.add(advertisedIdentity);
+      }
+      for (const endpoint of [service.endpoint, ...service.alternateEndpoints ?? []]) {
+        for (const identity of identityByEndpoint.get(endpoint.serial) ?? []) {
+          identities.add(identity);
+        }
+      }
+    }
+    const [hardwareSerial] = identities;
+    return identities.size === 1 && hardwareSerial !== undefined ? { ...observation, hardwareSerial } : observation;
+  });
+}
 function transportKind(device, services) {
   if (/^emulator-\d+$/u.test(device.serial)) {
     return "emulator";
@@ -2968,6 +3007,7 @@ function finish(context, data, problems) {
   const finished = context.clock();
   const exitCode = exitCodeForProblems(problems);
   const ok = exitCode === 0 /* Success */;
+  const interrupted = exitCode === 130 /* Interrupted */;
   const result = {
     schemaVersion: SCHEMA_VERSION,
     command: context.command,
@@ -2980,10 +3020,10 @@ function finish(context, data, problems) {
     problems
   };
   context.bus.emit({
-    type: ok ? "command.completed" : "command.failed",
+    type: ok ? "command.completed" : interrupted ? "command.interrupted" : "command.failed",
     source: `command.${context.command}`,
-    severity: ok ? "info" : "error",
-    message: ok ? `${context.command} completed` : `${context.command} failed`,
+    severity: ok ? "info" : interrupted ? "warning" : "error",
+    message: ok ? `${context.command} completed` : interrupted ? `${context.command} interrupted` : `${context.command} failed`,
     correlation: { commandId: context.commandId },
     data: { exitCode, problemCount: problems.length }
   });
@@ -3162,13 +3202,14 @@ async function inspectTargets(client, devices, commandId, signal, hostFeatures)
     }
   });
   const services = mdnsAvailable ? mdns.value : [];
-  const inventory = buildTargetInventory(devices.map((device) => {
+  const observations = devices.map((device) => {
     const hardwareSerial = identityBySerial.get(device.serial);
     return {
       device,
       ...hardwareSerial === undefined ? {} : { hardwareSerial }
     };
-  }), services);
+  });
+  const inventory = buildTargetInventory(correlateMdnsTransportIdentities(observations, services), services);
   return {
     targets: inventory.targets,
     discovery: {
@@ -3916,7 +3957,7 @@ async function runLogs(options, config = {}, dependencies = {}, signal) {
       "-v",
       "threadtime",
       ...buffers.flatMap((buffer) => ["-b", buffer]),
-      ...options.tail === undefined && options.since === undefined ? options.dump ? ["-d"] : [] : [options.dump ? "-t" : "-T", String(options.tail ?? options.since)],
+      ...options.tail === undefined && options.since === undefined ? options.dump ? ["-d"] : ["-T", "1"] : [options.dump ? "-t" : "-T", String(options.tail ?? options.since)],
       ...resolvedUid === undefined ? [] : [`--uid=${String(resolvedUid)}`],
       ...resolvedPid === undefined ? [] : [`--pid=${String(resolvedPid)}`],
       ...filters
@@ -4068,16 +4109,18 @@ async function runDev(options, config = {}, dependencies = {}, signal) {
     }
   }
   const complete = async (data) => {
-    if (problems.some(({ severity }) => severity === "error")) {
-      transition("failed", problems.find(({ severity }) => severity === "error")?.summary ?? "failed");
+    const interrupted = problems.some(({ code }) => code === ProblemCode.OperationInterrupted);
+    const failed = problems.some(({ code, severity }) => severity === "error" && code !== ProblemCode.OperationInterrupted);
+    if (failed) {
+      transition("failed", problems.find(({ code, severity }) => severity === "error" && code !== ProblemCode.OperationInterrupted)?.summary ?? "failed");
     }
     transition("stopping", "finalizing owned session resources");
     transition("ended", "session command finalized");
     bus.emit({
       type: "session.ended",
       source: "session",
-      severity: problems.some(({ severity }) => severity === "error") ? "error" : "info",
-      message: "Development session ended",
+      severity: failed ? "error" : interrupted ? "warning" : "info",
+      message: interrupted ? "Development session ended safely after interruption" : "Development session ended",
       correlation: { commandId: context.commandId, sessionId }
     });
     const execution2 = finish(context, data, problems);
@@ -4506,6 +4549,8 @@ async function runDev(options, config = {}, dependencies = {}, signal) {
         "logcat",
         "-v",
         "threadtime",
+        "-T",
+        "1",
         "ReactNativeJS:V",
         "ReactNative:V",
         "AndroidRuntime:E",
@@ -4874,7 +4919,7 @@ async function runDev(options, config = {}, dependencies = {}, signal) {
   await runHookPhase("finally", {}, false);
   const execution = await complete({
     ...baseData(),
-    status: problems.some(({ severity }) => severity === "error") ? "failed" : "completed",
+    status: problems.some(({ code, severity }) => severity === "error" && code !== ProblemCode.OperationInterrupted) ? "failed" : problems.some(({ code }) => code === ProblemCode.OperationInterrupted) ? "interrupted" : "completed",
     ports: {
       requested: normalizedPorts.mappings,
       created,
@@ -7060,7 +7105,13 @@ function isLogsData(value) {
   return isRecord(value) && isRecord(value.selected) && Array.isArray(value.filters) && Array.isArray(value.records) && typeof value.dropped === "number";
 }
 function isSessionCommandData(value) {
-  return isRecord(value) && (value.action === "list" || value.action === "show" || value.action === "events");
+  if (!isRecord(value))
+    return false;
+  if (value.action === "list")
+    return Array.isArray(value.sessions);
+  if (value.action === "show")
+    return isRecord(value.session);
+  return value.action === "events" && isRecord(value.session) && Array.isArray(value.events);
 }
 function isProblemsCommandData(value) {
   return isRecord(value) && typeof value.sessionId === "string" && typeof value.status === "string" && Array.isArray(value.problems);
@@ -7093,7 +7144,7 @@ function wirelessServiceLabel(service) {
 }
 function problemLines(problem, capabilities, verbose) {
   const glyphs = symbols(capabilities);
-  const marker = problem.severity === "error" ? style.failure(glyphs.failure, capabilities) : style.warning(glyphs.warning, capabilities);
+  const marker = problem.severity === "error" && problem.code !== ProblemCode.OperationInterrupted ? style.failure(glyphs.failure, capabilities) : style.warning(glyphs.warning, capabilities);
   const lines = [
     `${marker} ${style.strong(clean(problem.summary), capabilities)}`,
     `  ${clean(problem.detail)}`
@@ -7129,11 +7180,13 @@ function renderHuman(result, options) {
   }
   if (result.command === "dev" && isDevData(result.data)) {
     const data = result.data;
+    const sessionMarker = data.status === "interrupted" ? style.warning(glyphs.warning, capabilities) : data.status === "failed" ? style.failure(glyphs.failure, capabilities) : style.success(glyphs.success, capabilities);
     lines.push(`${style.success(glyphs.success, capabilities)} Target   ${clean(data.selected.target.name)} · ${clean(data.selected.transport.serial)}`, `${style.success(glyphs.success, capabilities)} Project  ${clean(data.project.name ?? data.project.root)} · ${clean(data.preset)}`, `${style.success(glyphs.success, capabilities)} Ports    ${String(data.ports.requested.length)} ready · ${String(data.ports.created.length)} created · ${String(data.ports.reused.length)} reused`, `${style.success(glyphs.success, capabilities)} Command  ${clean(data.command.executable)} ${data.command.args.map(clean).join(" ")}`);
     if (data.child !== undefined) {
-      lines.push(`${data.child.exitCode === 0 ? style.success(glyphs.success, capabilities) : style.failure(glyphs.failure, capabilities)} Child    ${data.child.exitCode === null ? clean(data.child.signal) : `exit ${String(data.child.exitCode)}`}`);
+      const childMarker = data.status === "interrupted" ? style.warning(glyphs.warning, capabilities) : data.child.exitCode === 0 ? style.success(glyphs.success, capabilities) : style.failure(glyphs.failure, capabilities);
+      lines.push(`${childMarker} Child    ${data.child.exitCode === null ? clean(data.child.signal) : `exit ${String(data.child.exitCode)}`}`);
     }
-    lines.push(`${style.success(glyphs.success, capabilities)} Journal  ${String(data.journal.events.length)} events${data.journal.dropped === 0 ? "" : ` · ${String(data.journal.dropped)} dropped`}`, `${data.recovery.failed ? style.failure(glyphs.failure, capabilities) : style.success(glyphs.success, capabilities)} Recovery ${data.recovery.failed ? "failed" : data.recovery.recoveries === 0 ? "healthy" : `${String(data.recovery.recoveries)} verified repair(s)`}`, `${style.success(glyphs.success, capabilities)} Session  ${clean(data.sessionId)} · ${clean(data.status)}`);
+    lines.push(`${style.success(glyphs.success, capabilities)} Journal  ${String(data.journal.events.length)} events${data.journal.dropped === 0 ? "" : ` · ${String(data.journal.dropped)} dropped`}`, `${data.recovery.failed ? style.failure(glyphs.failure, capabilities) : style.success(glyphs.success, capabilities)} Recovery ${data.recovery.failed ? "failed" : data.recovery.recoveries === 0 ? "healthy" : `${String(data.recovery.recoveries)} verified repair(s)`}`, `${sessionMarker} Session  ${clean(data.sessionId)} · ${clean(data.status)}`);
   }
   if (result.command === "logs" && isLogsData(result.data)) {
     const data = result.data;
@@ -7261,7 +7314,8 @@ function renderHuman(result, options) {
       lines.push(...problemLines(problem, capabilities, options.verbose ?? false));
     }
   }
-  const status = result.ok ? `${style.success(glyphs.success, capabilities)} Completed in ${String(result.durationMs)}ms` : `${style.failure(glyphs.failure, capabilities)} Failed in ${String(result.durationMs)}ms`;
+  const interrupted = result.problems.some(({ code }) => code === ProblemCode.OperationInterrupted) && !result.problems.some(({ code, severity }) => severity === "error" && code !== ProblemCode.OperationInterrupted);
+  const status = result.ok ? `${style.success(glyphs.success, capabilities)} Completed in ${String(result.durationMs)}ms` : interrupted ? `${style.warning(glyphs.warning, capabilities)} Interrupted safely in ${String(result.durationMs)}ms` : `${style.failure(glyphs.failure, capabilities)} Failed in ${String(result.durationMs)}ms`;
   lines.push("", status);
   sink.write(`${lines.join(`
 `)}
@@ -7500,8 +7554,25 @@ function renderResult(result, options) {
     options.sink.write(`${JSON.stringify(result)}
 `);
   } else if (options.format === "ndjson") {
-    options.sink.write(`${JSON.stringify({ kind: "result", ...result })}
+    if (isSessionCommandData(result.data) && result.data.action === "events") {
+      for (const event of result.data.events) {
+        options.sink.write(`${JSON.stringify({ kind: "event", ...event })}
 `);
+      }
+      options.sink.write(`${JSON.stringify({
+        kind: "result",
+        ...result,
+        data: {
+          action: result.data.action,
+          session: result.data.session,
+          eventCount: result.data.events.length
+        }
+      })}
+`);
+    } else {
+      options.sink.write(`${JSON.stringify({ kind: "result", ...result })}
+`);
+    }
   } else if (options.format === "plain") {
     renderPlain(result, options.sink);
   } else {
@@ -7523,6 +7594,37 @@ class NdjsonEventRenderer {
   }
 }
 
+// src/ui/stream-renderer.ts
+var ERROR_LINE = /(?:^|\s)(?:err!|error|fatal|exception|failed|failure|crash)(?::|\b)/iu;
+var WARNING_LINE = /(?:^|\s)(?:warn|warning|deprecated|deprecation)(?::|\b)/iu;
+var SUCCESS_LINE = /(?:^|\s)(?:ready|started|bundled|done|success|completed)(?::|\b)/iu;
+var PROGRESS_LINE = /(?:^|\s)(?:starting|building|bundling|opening|waiting)(?::|\b)/iu;
+function renderLogStreamLine(line, capabilities) {
+  const safe = sanitizeTerminalText(line);
+  const parsed = parseLogcatThreadtimeLine(safe);
+  if (parsed?.priority === "E" || parsed?.priority === "F" || parsed?.priority === "A") {
+    return style.failure(safe, capabilities);
+  }
+  if (parsed?.priority === "W")
+    return style.warning(safe, capabilities);
+  if (parsed?.priority === "D" || parsed?.priority === "V") {
+    return style.dim(safe, capabilities);
+  }
+  if (parsed?.priority === "I")
+    return style.accent(safe, capabilities);
+  if (ERROR_LINE.test(safe))
+    return style.failure(safe, capabilities);
+  if (WARNING_LINE.test(safe))
+    return style.warning(safe, capabilities);
+  return safe;
+}
+function renderChildStreamLine(stream, line, capabilities) {
+  const safe = sanitizeTerminalText(line);
+  const prefix = style.dim(stream === "stderr" ? "│" : " ", capabilities);
+  const rendered = ERROR_LINE.test(safe) ? style.failure(safe, capabilities) : WARNING_LINE.test(safe) ? style.warning(safe, capabilities) : SUCCESS_LINE.test(safe) ? style.success(safe, capabilities) : PROGRESS_LINE.test(safe) ? style.accent(safe, capabilities) : safe;
+  return `${prefix} ${rendered}`;
+}
+
 // src/ui/terminal.ts
 function environmentFlag(value) {
   if (value === undefined) {
@@ -8271,7 +8373,8 @@ Lists every target visible to ADB. Add --select to open the keyboard picker.
 `,
   logs: `Usage: adb-ready logs [options]
 
-Streams parsed, redacted logcat records from one deterministic target.
+Streams parsed, redacted logcat records from one deterministic target. Live
+streams follow from now by default instead of replaying the device buffer.
 
 Log options:
   --package NAME         Resolve and filter the currently running app process
@@ -8847,8 +8950,10 @@ async function runCliInternal(argv, io, dependencies = {}, signal) {
         ...options.logTail === undefined ? {} : { tail: options.logTail },
         ...options.logDump === undefined ? {} : { dump: options.logDump },
         ...options.logMaxRecords === undefined ? {} : { maxRecords: options.logMaxRecords },
-        ...options.format === "human" && !options.quiet ? { onLine: (line) => io.error.write(`${line}
-`) } : {}
+        ...options.format === "human" && !options.quiet ? {
+          onLine: (line) => io.error.write(`${renderLogStreamLine(line, errorCapabilities)}
+`)
+        } : {}
       }, config, commandDependencies, signal);
     } else if (options.command === "dev") {
       execution2 = await runDev({
@@ -8890,7 +8995,7 @@ async function runCliInternal(argv, io, dependencies = {}, signal) {
         },
         ...options.format === "human" && !options.quiet ? {
           onChildLine: (stream, line) => {
-            io.error.write(`${stream === "stderr" ? "│" : " "} ${line}
+            io.error.write(`${renderChildStreamLine(stream, line, errorCapabilities)}
 `);
           }
         } : {}
@@ -9060,4 +9165,4 @@ try {
   process10.removeListener("SIGTERM", abort);
 }
 
-//# debugId=9D393E2FCFBCF69364756E2164756E21
+//# debugId=D3161FCA6036C77564756E2164756E21