elanous 0.2.0 → 0.2.4

package/src/cli/pwa-share.ts

@@ -32,9 +32,10 @@ import {
 } from '../nexus/config/user-config.js';
 import { resolveNexusPwa, type NexusPwaResolution } from './nexus-show.js';
 import { debug } from '../debug/log.js';
+import { resolveDaemonEndpoint } from '../nexus/daemon-endpoint.js';
 
 export type ShareTailnetValue = 'ask' | 'enabled' | 'disabled';
-type SharePortSource = 'default' | 'explicit' | 'nexus' | 'unknown';
+type SharePortSource = 'endpoint' | 'explicit' | 'nexus' | 'unknown';
 
 interface SharePortResolution {
   port?: number;
@@ -122,9 +123,7 @@ async function defaultReset(binary: string, port: number): Promise<{ exitCode: n
     }),
   });
   if (r.ok) return { exitCode: 0 };
-  // Best-effort exit-code recovery: serve-cmd-failed often means
-  // "nothing to unmount" which we surface as 0 (idempotent contract).
-  if (r.reason === 'serve-cmd-failed' || r.reason === 'no-state') return { exitCode: 0 };
+  // A failed command or unreadable state cannot confirm the mount is gone.
   return { exitCode: 1 };
 }
 
@@ -143,7 +142,7 @@ function defaultMountStatus(binary: string, port: number): Promise<TailscaleServ
   return inspectTailscaleServeMount({ binary, port, useSudo: true });
 }
 
-function resolveDeps(deps: PwaShareDeps): Required<PwaShareDeps> & { portExplicit: boolean } {
+function resolveDeps(deps: PwaShareDeps): Omit<Required<PwaShareDeps>, 'port'> & { port?: number; portExplicit: boolean } {
   return {
     readSwitch: deps.readSwitch ?? defaultReadSwitch,
     saveSwitch: deps.saveSwitch ?? defaultSaveSwitch,
@@ -153,12 +152,26 @@ function resolveDeps(deps: PwaShareDeps): Required<PwaShareDeps> & { portExplici
     nexusAliveFn: deps.nexusAliveFn ?? defaultNexusAlive,
     mountStatusFn: deps.mountStatusFn ?? defaultMountStatus,
     resolveNexusPwaFn: deps.resolveNexusPwaFn ?? resolveNexusPwa,
-    port: deps.port ?? 31415,
+    port: deps.port,
     portExplicit: deps.port !== undefined,
     out: deps.out ?? console,
   };
 }
 
+function resolveWritePort(r: ReturnType<typeof resolveDeps>): SharePortResolution {
+  if (r.portExplicit) return { port: r.port, source: 'explicit' };
+  try {
+    const endpoint = resolveDaemonEndpoint();
+    if (!endpoint) return { source: 'unknown', reason: 'daemon-absent' };
+    const port = Number(new URL(endpoint.baseUrl).port);
+    return Number.isInteger(port) && port >= 1 && port <= 65_535
+      ? { port, source: 'endpoint' }
+      : { source: 'unknown', reason: 'daemon-port-unknown' };
+  } catch {
+    return { source: 'unknown', reason: 'daemon-query-failed' };
+  }
+}
+
 function resolveStatusPort(r: ReturnType<typeof resolveDeps>): SharePortResolution {
   if (r.portExplicit) return { port: r.port, source: 'explicit' };
   try {
@@ -216,26 +229,32 @@ export async function pwaShareEnable(deps: PwaShareDeps = {}): Promise<PwaShareR
     r.out.error('  Start Tailscale + retry.');
     return { exitCode: 1 };
   }
+  const portResolution = resolveWritePort(r);
+  const port = portResolution.port;
+  if (port === undefined) {
+    r.out.error('elanous nexus pwa share enable: 데몬 주소를 모른다 — `elanous nexus run` 먼저.');
+    return { exitCode: 1 };
+  }
+  debug.log('nexus.pwa-share', 'port-resolved', { port, source: r.portExplicit ? 'flag' : 'endpoint' });
   // Persist the user's intent to UserConfig BEFORE attempting serve.
   // The switch is the source of truth read by `pwa start` — saving it
   // first means a transient `tailscale serve` failure doesn't lose the
   // user's "I want share enabled" decision: the next `pwa start` (or
   // `pwa share enable` retry) auto-brings the forward up.
   r.saveSwitch('enabled');
-  const serveResult = await r.serveFn(probe.binary ?? 'tailscale', r.port);
+  const serveResult = await r.serveFn(probe.binary ?? 'tailscale', port);
   if (serveResult.exitCode !== 0) {
     r.out.error(`elanous nexus pwa share enable: tailscale serve failed (exit ${serveResult.exitCode}).`);
     r.out.error('  Switch saved (shareTailnet=enabled) — next `pwa start` will retry the forward.');
     return { exitCode: serveResult.exitCode };
   }
   const host = probe.magicDnsHost ?? probe.hostname ?? probe.ips?.[0] ?? '<host>';
-  r.out.log(`✓ tailnet share enabled. URL: https://${host}:${r.port}/app/`);
-  // Quick nexus health probe — if nothing is listening on r.port, the
-  // forward is registered but has no upstream yet. Tell the user how to
-  // bring nexus up so they don't think the share is broken.
-  const nexusUp = await r.nexusAliveFn(r.port);
+  r.out.log(`✓ tailnet share enabled. URL: https://${host}:${port}/app/`);
+  // Quick nexus health probe — if nothing is listening on this port, the
+  // forward is registered but has no upstream yet.
+  const nexusUp = await r.nexusAliveFn(port);
   if (!nexusUp) {
-    r.out.log(`⚠ nexus is not currently running on :${r.port} — \`elanous nexus run\` to bring it up.`);
+    r.out.log(`⚠ nexus is not currently running on :${port} — \`elanous nexus run\` to bring it up.`);
   }
   return {
     exitCode: 0,
@@ -243,7 +262,7 @@ export async function pwaShareEnable(deps: PwaShareDeps = {}): Promise<PwaShareR
       switchValue: 'enabled',
       mountStatus: 'mounted',
       probe,
-      portResolution: { port: r.port, source: r.portExplicit ? 'explicit' : 'default' },
+      portResolution,
     }),
   };
 }
@@ -251,23 +270,47 @@ export async function pwaShareEnable(deps: PwaShareDeps = {}): Promise<PwaShareR
 export async function pwaShareDisable(deps: PwaShareDeps = {}): Promise<PwaShareResult> {
   const r = resolveDeps(deps);
   const probe = await r.probeFn();
+  const portResolution = resolveWritePort(r);
+  const port = portResolution.port;
+  if (port === undefined) {
+    r.saveSwitch('disabled');
+    r.out.error('elanous nexus pwa share disable: switch disabled, but 데몬 주소를 모른다 — Tailscale unmount is unconfirmed; existing share may still be active. `elanous nexus run` 먼저.');
+    return {
+      exitCode: 1,
+      report: buildReport({
+        switchValue: 'disabled',
+        mountStatus: 'unknown',
+        probe,
+        portResolution,
+      }),
+    };
+  }
+  let mountStatus: TailscaleServeMountStatus = 'unknown';
   if (probe.installed && probe.alive) {
-    const resetResult = await r.resetFn(probe.binary ?? 'tailscale', r.port);
+    debug.log('nexus.pwa-share', 'port-resolved', { port, source: r.portExplicit ? 'flag' : 'endpoint' });
+    const resetResult = await r.resetFn(probe.binary ?? 'tailscale', port);
     if (resetResult.exitCode !== 0) {
-      // unmount is idempotent — non-zero usually means "nothing to
-      // unmount on this port", which is a non-fatal warning.
-      r.out.error(`(warn) tailscale serve unmount exit ${resetResult.exitCode} — assuming port :${r.port} already off.`);
+      r.out.error(`(warn) tailscale serve unmount exit ${resetResult.exitCode} — port :${port} may still be shared.`);
+      // 해제 명령이 실패해도 «원래 안 걸려 있었을» 수 있다 — 실제 마운트를 다시 재서 가른다.
+      try { mountStatus = await r.mountStatusFn(probe.binary ?? 'tailscale', port); } catch { mountStatus = 'unknown'; }
+    } else {
+      mountStatus = 'unmounted';
     }
+  } else if (!probe.installed) {
+    // Tailscale 이 없으면 tailnet 공유는 존재할 수 없다.
+    mountStatus = 'unmounted';
   }
   r.saveSwitch('disabled');
-  r.out.log('✓ local-only. Re-enable: `elanous nexus pwa share enable`.');
+  if (mountStatus === 'unmounted') r.out.log('✓ local-only. Re-enable: `elanous nexus pwa share enable`.');
+  else r.out.error('elanous nexus pwa share disable: switch disabled, but Tailscale unmount is unconfirmed; existing share may still be active.');
   return {
-    exitCode: 0,
+    // 해제를 «확인했을 때만» 성공 — 미확인 해제를 0 으로 알리지 않는다(리뷰 R3).
+    exitCode: mountStatus === 'unmounted' ? 0 : 1,
     report: buildReport({
       switchValue: 'disabled',
-      mountStatus: 'unmounted',
+      mountStatus,
       probe,
-      portResolution: { port: r.port, source: r.portExplicit ? 'explicit' : 'default' },
+      portResolution,
     }),
   };
 }

package/src/cli/pwa-show.ts

@@ -13,7 +13,7 @@
 // When a match is found, surface:
 //   - alive flag (pid still live?)
 //   - all ports (nexus + dev for HMR)
-//   - loopback URL (always — local fallback)
+//   - loopback URL (when the daemon's HTTP port is known)
 //   - tailnet URL (only when `shareMounted=true` — picks up share
 //     enable / `--https` ad-hoc)
 //
@@ -26,6 +26,8 @@ import { join } from 'node:path';
 
 import { listPwaInstances, type PwaInstanceListing } from './pwa-registry.js';
 import { probeTailscale, type TailscaleProbe } from '../nexus/onboarding/tailscale-probe.js';
+import { resolveDaemonEndpoint } from '../nexus/daemon-endpoint.js';
+import { debug } from '../debug/log.js';
 
 export interface PwaShowOpts {
   /** Format. Default 'human'. */
@@ -75,9 +77,23 @@ export async function runPwaShow(opts: PwaShowOpts = {}): Promise<PwaShowResult>
     return { exitCode: 0 };
   }
 
-  // Compute URLs. Loopback always. Tailnet requires share mounted +
-  // tailscale alive + magic-DNS hostname.
-  const httpPort = match.ports[0] ?? 31415; // first port = nexus
+  // Prefer the registry's nexus port; only consult the watch endpoint when it is absent.
+  const registryPort = match.ports[0];
+  let endpointPort: number | undefined;
+  if (registryPort === undefined) {
+    try {
+      const endpoint = resolveDaemonEndpoint({ purpose: 'watch' });
+      endpointPort = endpoint ? Number(new URL(endpoint.baseUrl).port) : undefined;
+    } catch { /* No usable daemon address. */ }
+  }
+  const httpPort = registryPort ?? endpointPort;
+  if (httpPort === undefined || !Number.isInteger(httpPort) || httpPort < 1 || httpPort > 65_535) {
+    const message = '데몬 주소를 모른다 — `elanous nexus run` 먼저';
+    if (format === 'json') out.log(JSON.stringify({ instance: match, urls: null, reason: message }, null, 2));
+    else out.log(message);
+    return { exitCode: 1, instance: match };
+  }
+  debug.log('nexus.pwa-share', 'port-resolved', { port: httpPort, source: registryPort === undefined ? 'endpoint' : 'bound' });
   const loopback = `http://127.0.0.1:${httpPort}/app/`;
   let tailnet: string | undefined;
   if (match.shareMounted) {

package/src/cli/pwa-start.ts

@@ -11,7 +11,8 @@ import {
   readSwitchValue,
   readUserConfig,
 } from '../nexus/config/user-config.js';
-import { registerPwaInstance, listPwaInstances, type PwaRegistryEntry } from './pwa-registry.js';
+import { registerPwaInstance, listPwaInstances, type PwaRegistryEntry, type PwaLauncherProvenance } from './pwa-registry.js';
+import { debug } from '../debug/log.js';
 import { runPwaBuild, checkPwaBuildDeps, resolvePwaCwd, type PwaBuildResult } from './pwa-build.js';
 import { runPwaInstall, type PwaInstallResult } from './pwa-install.js';
 import { runPwaStop, type PwaStopOpts, type PwaStopResult } from './pwa-stop.js';
@@ -19,7 +20,10 @@ import { checkPwaStaleness } from './pwa-staleness.js';
 import { unmountTailscaleServe, type UnmountTailscaleServeResult } from './tailscale-serve.js';
 import { nexusRootDir } from '../nexus/paths.js';
 import { resolveCurrentInstance } from '../instance/current.js';
+import { leaseTestPort, releaseTestPort, transferTestPort } from './port-lease-local.js';
+import { isPidAlive } from '../process/pid-liveness.js';
 import type { InstanceResolution } from '../instance/resolve.js';
+import { DEFAULT_NEXUS_HTTP_PORT } from '../nexus/default-port.js';
 
 type ShareTailnetValue = 'ask' | 'enabled' | 'disabled';
 
@@ -73,6 +77,10 @@ export interface PwaStartOpts {
   historyDir?: string;
   httpHost?: string;
   httpPort?: number;
+  /** Coordinator lease passed to the detached daemon (not used for explicit ports). */
+  coordinatorLeasePort?: number;
+  coordinatorLeaseToken?: string;
+  coordinatorLeaseId?: string;
   /** P3 (2026-05-10) — read UserConfig fallback for ports. Default
    *  reads `global.nexus.pwa.{port,devPort}`. Test seam to inject a
    *  fixture without touching disk. */
@@ -123,6 +131,7 @@ export interface PwaStartOpts {
   bgLaunchFn?: (opts: {
     force?: boolean;
     forwardArgs?: string[];
+    childEnv?: Record<string, string>;
     out?: { log: (s: string) => void; error: (s: string) => void };
   }) => Promise<BgLaunchResult>;
   /** P-2D.3' — replace the dev BG launcher (default = runPwaDevBgLaunch). */
@@ -179,9 +188,11 @@ export interface PwaStartOpts {
    *  `runPwaStop`. */
   stopFn?: (opts: PwaStopOpts) => Promise<PwaStopResult>;
   /** Read pwa-registry for the same-tree collision check. */
-  listInstancesFn?: () => Array<{ cwd: string; alive: boolean; daemonDir: string }>;
+  listInstancesFn?: () => Array<{ cwd: string; alive: boolean; daemonDir: string; pid?: number; launcherProvenance?: PwaLauncherProvenance }>;
   /** Resolve the current process instance. Test seam for registry kind. */
   resolveCurrentInstanceFn?: () => InstanceResolution;
+  /** Isolate local test leases in a temporary directory in tests. */
+  leaseDir?: string;
 }
 
 export interface PwaStartResult {
@@ -233,7 +244,7 @@ function collectForwardArgs(opts: PwaStartOpts, httpPort: number): string[] {
  *    CLI flag (opts.httpPort/opts.devPort) > UserConfig > hard default. */
 function resolvePorts(opts: PwaStartOpts): { httpPort: number; devPort: number } {
   const readConfigPort = opts.readConfigPortFn ?? defaultReadConfigPort;
-  const httpPort = opts.httpPort ?? readConfigPort('global.nexus.pwa.port') ?? 31415;
+  const httpPort = opts.httpPort ?? readConfigPort('global.nexus.pwa.port') ?? DEFAULT_NEXUS_HTTP_PORT;
   const devPort = opts.devPort ?? readConfigPort('global.nexus.pwa.devPort') ?? 3210;
   return { httpPort, devPort };
 }
@@ -397,9 +408,9 @@ async function maybeAutoBuild(
 
 /** Same-tree restart helper — when bg-launch reports a port collision,
  *  check the pwa-registry for an alive instance in our cwd (or our
- *  daemonDir) and stop it before retrying. Returns `true` when a restart
- *  was attempted (caller should re-invoke bgLaunch once); `false` when
- *  cross-tree / no holder found / autoRestart=false. */
+ *  daemonDir) and stop it before retrying, unless a service manager
+ *  supervises it. Returns `true` when a restart was attempted (caller
+ *  should re-invoke bgLaunch once); `false` otherwise. */
 async function maybeAutoRestart(
   opts: PwaStartOpts,
   out: NonNullable<PwaStartOpts['out']>,
@@ -407,7 +418,7 @@ async function maybeAutoRestart(
   // opt-in at the lib level; CLI flips default on
   if (opts.autoRestart !== true) return false;
   const listFn = opts.listInstancesFn ?? (() => listPwaInstances({ prune: false }));
-  let instances: Array<{ cwd: string; alive: boolean; daemonDir: string }> = [];
+  let instances: ReturnType<NonNullable<PwaStartOpts['listInstancesFn']>> = [];
   try {
     instances = listFn();
   } catch {
@@ -415,9 +426,18 @@ async function maybeAutoRestart(
   }
   const ourCwd = process.cwd();
   const ourDaemonDir = nexusRootDir();
-  const sameTree = instances.find((i) =>
+  const sameTreeInstances = instances.filter((i) =>
     i.alive && (i.cwd === ourCwd || i.daemonDir === ourDaemonDir),
   );
+  const supervised = sameTreeInstances.find((i) => i.launcherProvenance?.kind === 'service-manager');
+  if (supervised?.launcherProvenance?.kind === 'service-manager') {
+    const serviceName = supervised.launcherProvenance.serviceName;
+    const supervisor = serviceName === 'systemd' ? 'systemd' : 'launchd';
+    out.error(`이 데몬은 ${supervisor} 가 감독한다 — 멈추지 않았다. 재시작이 필요한지 먼저 \`elanous nexus restart-needed\` · 필요하면 운영자에게 알린 뒤 감독자로 재시작. 시험 데몬은 \`--test --port <격리 포트>\``);
+    debug.log('nexus.auto-restart', 'refused-supervised', { serviceName, pid: supervised.pid });
+    return false;
+  }
+  const sameTree = sameTreeInstances[0];
   if (!sameTree) return false;
   out.log('');
   out.log(`  auto-restart: same-tree daemon detected (cwd=${sameTree.cwd}) — stopping then retrying...`);
@@ -526,7 +546,7 @@ export async function runPwaStart(opts: PwaStartOpts = {}): Promise<PwaStartResu
   const out = opts.out ?? console;
   const mode: PwaStartMode = opts.mode ?? 'static';
   const bgLaunchFn = opts.bgLaunchFn ?? runBgLaunch;
-  const { httpPort, devPort } = resolvePorts(opts);
+  const ports = resolvePorts(opts);
   let registryKind: PwaRegistryEntry['kind'] = 'production';
   try {
     if ((opts.resolveCurrentInstanceFn ?? resolveCurrentInstance)().kind === 'test') {
@@ -534,37 +554,81 @@ export async function runPwaStart(opts: PwaStartOpts = {}): Promise<PwaStartResu
     }
   } catch { /* instance resolution is best-effort — registry writes still proceed */ }
 
+  let httpPort = ports.httpPort;
+  const devPort = ports.devPort;
+  let leased = false;
+  if (registryKind === 'test' && opts.httpPort === undefined) {
+    const claim = await leaseTestPort({ owner: process.cwd(), ...(opts.leaseDir ? { dir: opts.leaseDir } : {}) });
+    if ('error' in claim) {
+      out.error('시험 대역에 빈 포트가 없습니다 (31450..31499).');
+      return { exitCode: 1 };
+    }
+    httpPort = claim.port;
+    leased = true;
+    out.log(`시험 대역에서 :${httpPort} 임대`);
+  }
+  const dropLauncherLease = () => {
+    if (leased) releaseTestPort(httpPort, process.pid, opts.leaseDir);
+  };
   // A · staleness / forced rebuild — runs once before the daemon spawns
   //   so the very first request after start serves the new bundle.
-  const buildExit = await maybeAutoBuild(opts, out, mode);
-  if (buildExit !== 0) return { exitCode: buildExit };
-
+  let buildExit: number;
+  try {
+    buildExit = await maybeAutoBuild(opts, out, mode);
+  } catch (err) {
+    dropLauncherLease();
+    throw err;
+  }
+  if (buildExit !== 0) {
+    dropLauncherLease();
+    return { exitCode: buildExit };
+  }
   // Preflight — proactively unmount a stale Tailscale serve binding so
   // the bind below doesn't lose interface ownership to a zombie.
-  await preflightCleanStaleServe(opts, out, httpPort);
+  try {
+    await preflightCleanStaleServe(opts, out, httpPort);
+  } catch (err) {
+    dropLauncherLease();
+    throw err;
+  }
 
-  let bg = await bgLaunchFn({
-    ...(opts.force ? { force: true } : {}),
-    forwardArgs: collectForwardArgs(opts, httpPort),
-    out,
-  });
+  let bg: BgLaunchResult;
+  try {
+    bg = await bgLaunchFn({
+      ...(opts.force ? { force: true } : {}),
+      forwardArgs: collectForwardArgs(opts, httpPort),
+      ...(opts.coordinatorLeasePort !== undefined ? { childEnv: { ELANOUS_TEST_COORDINATOR_LEASE_PORT: String(opts.coordinatorLeasePort), ...(opts.coordinatorLeaseToken ? { ELANOUS_TEST_COORDINATOR_LEASE_TOKEN: opts.coordinatorLeaseToken } : {}), ...(opts.coordinatorLeaseId ? { ELANOUS_TEST_COORDINATOR_LEASE_ID: opts.coordinatorLeaseId } : {}) } } : {}),
+      out,
+    });
+  } catch (err) {
+    dropLauncherLease();
+    throw err;
+  }
 
   // B · same-tree auto-restart — when bg-launch trips the existing-lock
-  //   path AND the live holder lives in our cwd/daemonDir, stop it and
-  //   retry once. Cross-tree collisions still hit the 4-option hint
+  //   path AND the live holder lives in our cwd/daemonDir, maybeAutoRestart
+  //   refuses supervised holders; only unsupervised holders are stopped and
+  //   retried once. Cross-tree collisions still hit the 4-option hint
   //   below so a user with multiple trees can't accidentally kill the
   //   other one's daemon.
   if (bg.exitCode !== 0) {
-    const retried = await maybeAutoRestart(opts, out);
-    if (retried) {
-      bg = await bgLaunchFn({
-        ...(opts.force ? { force: true } : {}),
-        forwardArgs: collectForwardArgs(opts, httpPort),
-        out,
-      });
+    const shouldRetry = await maybeAutoRestart(opts, out);
+    if (shouldRetry) {
+      try {
+        bg = await bgLaunchFn({
+          ...(opts.force ? { force: true } : {}),
+          forwardArgs: collectForwardArgs(opts, httpPort),
+          ...(opts.coordinatorLeasePort !== undefined ? { childEnv: { ELANOUS_TEST_COORDINATOR_LEASE_PORT: String(opts.coordinatorLeasePort), ...(opts.coordinatorLeaseToken ? { ELANOUS_TEST_COORDINATOR_LEASE_TOKEN: opts.coordinatorLeaseToken } : {}), ...(opts.coordinatorLeaseId ? { ELANOUS_TEST_COORDINATOR_LEASE_ID: opts.coordinatorLeaseId } : {}) } } : {}),
+          out,
+        });
+      } catch (err) {
+        dropLauncherLease();
+        throw err;
+      }
     }
   }
   if (bg.exitCode !== 0) {
+    dropLauncherLease();
     // P3 collision hint — bgLaunch typically exits non-zero when an
     // existing lock holder occupies our port. The user-facing diagnostic
     // for a clean recovery path: take over (`--force`), pick another
@@ -579,6 +643,14 @@ export async function runPwaStart(opts: PwaStartOpts = {}): Promise<PwaStartResu
     out.error('         · permanent: `elanous config set global.nexus.pwa.port <n>`');
     return { exitCode: bg.exitCode };
   }
+  if (leased) {
+    if (typeof bg.pid === 'number' && isPidAlive(bg.pid)) {
+      transferTestPort(httpPort, process.pid, bg.pid, opts.leaseDir);
+    } else {
+      // A launcher reporting success without a live daemon must not retain a claim.
+      dropLauncherLease();
+    }
+  }
   if (mode !== 'hmr') {
     // Static mode: nexus is up, no dev BG. Verify the daemon actually
     // bound the port (catches the stale-serve / EADDRINUSE / partial