@moretea-labs/forge 1.7.2 → 1.8.1

package/src/runtime/root/package-connector-service.ts

@@ -1,10 +1,12 @@
 import { createHash } from 'crypto';
-import { closeSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, writeFileSync } from 'fs';
+import { chmodSync, copyFileSync, existsSync, lstatSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from 'fs';
 import { homedir } from 'os';
 import { basename, dirname, join, resolve } from 'path';
-import { spawn, spawnSync } from 'child_process';
-import { bootstrapLaunchAgentWithRetryV2, installLaunchAgent, launchAgentPath, retireConflictingForgeLaunchAgents } from '../../cli/controller/launch-agents';
+import { loadMcpServiceLocalConfig } from '../../cli/mcp/auth';
+import { runtimeAuthorityFreeEnvironment } from '../shared/process-environment';
 import type { PackageRuntimeRelease } from './package-runtime-release';
+import { createPlatformServiceManagerHost, platformLaunchdInstalledPath, type PlatformServiceManagerHost, type SystemdUserUnitInput } from '../platform/service-manager';
+import { forgeConnectorPersistentServiceLabel } from '../platform/service-inventory';
 
 export interface PackageConnectorServicePaths {
   label: string;
@@ -14,9 +16,13 @@ export interface PackageConnectorServicePaths {
   stdoutPath: string;
   stderrPath: string;
   authorityPath: string;
+  activeEntrypointPath: string;
 }
 
-export type PackageConnectorReleaseBinding = Pick<PackageRuntimeRelease, 'releaseId' | 'releaseRoot' | 'packageRoot'>;
+export type PackageConnectorReleaseBinding = Pick<PackageRuntimeRelease, 'releaseId' | 'releaseRoot' | 'packageRoot'> & {
+  connectorEntrypoint?: 'forge-mcp-gateway';
+  connectorArtifactIdentity?: string;
+};
 
 export interface PackageConnectorServiceAuthority {
   schemaVersion: 1;
@@ -27,6 +33,7 @@ export interface PackageConnectorServiceAuthority {
   mode: 'launchd' | 'systemd-user' | 'portable';
   persistent: boolean;
   servicePath?: string;
+  connectorArtifactIdentity?: string;
   installedAt: string;
 }
 
@@ -37,10 +44,13 @@ export interface PackageConnectorServiceResult {
   servicePath?: string;
   pid?: number;
   reused?: boolean;
+  rebound?: boolean;
   releaseId?: string;
   releaseRoot?: string;
 }
 
+export type PackageConnectorAuthMode = 'oauth' | 'none';
+
 function xml(value: string): string {
   return value.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;').replaceAll('"', '&quot;');
 }
@@ -54,17 +64,17 @@ function atomicWrite(path: string, content: string, mode = 0o600): void {
 
 export function packageConnectorServicePaths(controllerHome: string, accountHome = process.env.HOME ?? homedir()): PackageConnectorServicePaths {
   const home = resolve(controllerHome);
-  const suffix = createHash('sha256').update(home).digest('hex').slice(0, 12);
-  const label = `com.moretea.forge.mcp-gateway.${suffix}`;
+  const label = forgeConnectorPersistentServiceLabel(home);
   const serviceRoot = join(home, 'runtime', 'connector-service');
   return {
     label,
     serviceRoot,
     sourcePlistPath: join(serviceRoot, `${label}.plist`),
-    installedPlistPath: launchAgentPath(label, accountHome),
+    installedPlistPath: platformLaunchdInstalledPath(label, accountHome),
     stdoutPath: join(serviceRoot, 'logs', 'stdout.log'),
     stderrPath: join(serviceRoot, 'logs', 'stderr.log'),
     authorityPath: join(serviceRoot, 'authority.json'),
+    activeEntrypointPath: join(serviceRoot, 'active-forge-mcp-gateway'),
   };
 }
 
@@ -80,13 +90,15 @@ export function readPackageConnectorServiceAuthority(controllerHome: string): Pa
     || typeof parsed.packageRoot !== 'string'
     || !['launchd', 'systemd-user', 'portable'].includes(String(parsed.mode))
     || typeof parsed.persistent !== 'boolean'
+    || (parsed.connectorArtifactIdentity !== undefined && !/^sha256:[a-f0-9]{64}$/i.test(parsed.connectorArtifactIdentity))
     || typeof parsed.installedAt !== 'string'
   ) throw new Error('FORGE_PACKAGE_CONNECTOR_AUTHORITY_INVALID');
   return parsed as PackageConnectorServiceAuthority;
 }
 
-function writePackageConnectorServiceAuthority(input: { release: PackageConnectorReleaseBinding; controllerHome: string; result: PackageConnectorServiceResult }): void {
+function writePackageConnectorServiceAuthority(input: { release: PackageConnectorReleaseBinding; controllerHome: string; result: PackageConnectorServiceResult; installedAt?: string }): void {
   const paths = packageConnectorServicePaths(input.controllerHome);
+  const artifact = attestedCompiledConnector(input.release);
   const authority: PackageConnectorServiceAuthority = {
     schemaVersion: 1,
     endpoint: input.result.endpoint,
@@ -96,25 +108,40 @@ function writePackageConnectorServiceAuthority(input: { release: PackageConnecto
     mode: input.result.mode,
     persistent: input.result.persistent,
     ...(input.result.servicePath ? { servicePath: input.result.servicePath } : {}),
-    installedAt: new Date().toISOString(),
+    ...(artifact ? { connectorArtifactIdentity: artifact.identity } : {}),
+    installedAt: input.installedAt ?? new Date().toISOString(),
   };
   atomicWrite(paths.authorityPath, `${JSON.stringify(authority, null, 2)}\n`);
 }
 
-export function packageConnectorEndpointStatusHealthy(status: number): boolean {
-  // The OAuth-protected MCP endpoint is healthy when it either answers directly
-  // or returns the expected unauthenticated Bearer challenge. Treating every
-  // received HTTP status as healthy masks upstream 5xx failures that are often
-  // surfaced remotely as 502 and prevents the persistent service from healing.
-  return status === 200 || status === 401;
+export function packageConnectorEndpointStatusHealthy(status: number, authMode: PackageConnectorAuthMode = 'oauth'): boolean {
+  // A Secure Tunnel owns external authentication and therefore its loopback
+  // Connector must answer directly. Accepting an OAuth challenge in `none`
+  // mode hides a stale service unit that was rewritten by an older lifecycle
+  // path, then makes every tunneled request fail remotely with 401.
+  return status === 200 || (authMode === 'oauth' && status === 401);
+}
+
+export function packageConnectorReadinessEndpoint(endpoint: string): string {
+  const parsed = new URL(endpoint);
+  if (parsed.protocol !== 'http:' || parsed.hostname !== '127.0.0.1' || parsed.pathname !== '/mcp') {
+    throw new Error('FORGE_PACKAGE_CONNECTOR_ENDPOINT_INVALID');
+  }
+  parsed.pathname = '/transport-ready';
+  parsed.search = '';
+  parsed.hash = '';
+  return parsed.toString();
 }
 
 async function defaultConnectorEndpointProbe(endpoint: string): Promise<boolean> {
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), 1_500);
   try {
-    const response = await fetch(endpoint, { method: 'GET', redirect: 'manual', signal: controller.signal });
-    return packageConnectorEndpointStatusHealthy(response.status);
+    // GET /mcp is a protocol request, not a liveness request: in auth:none it
+    // correctly responds 400 without an MCP session. /transport-ready is the
+    // in-memory, transport-scoped readiness surface used by Recovery.
+    const response = await fetch(packageConnectorReadinessEndpoint(endpoint), { method: 'GET', redirect: 'manual', signal: controller.signal });
+    return response.status === 200;
   } catch {
     return false;
   } finally {
@@ -127,6 +154,7 @@ export async function waitForPackageConnectorEndpointReady(
   options: {
     timeoutMs?: number;
     pollIntervalMs?: number;
+    authMode?: PackageConnectorAuthMode;
     probeEndpoint?: (endpoint: string) => Promise<boolean>;
     wait?: (ms: number) => Promise<void>;
     now?: () => number;
@@ -146,32 +174,112 @@ export async function waitForPackageConnectorEndpointReady(
   return false;
 }
 
-export function packageConnectorLaunchSpec(input: { release: PackageConnectorReleaseBinding; controllerHome: string; endpoint: string; executable?: string }): { executable: string; args: string[]; environment: Record<string, string>; port: number } {
+export function packageConnectorAuthMode(controllerHome: string): PackageConnectorAuthMode {
+  // OpenAI Secure MCP Tunnels authenticate the tunnel itself. The local
+  // Connector must not advertise a loopback OAuth issuer to ChatGPT in that
+  // topology. Keep OAuth as the default for existing HTTPS Connectors, and
+  // require an explicit per-instance opt-in before disabling it.
+  return loadMcpServiceLocalConfig(controllerHome)?.auth?.mode?.trim().toLowerCase() === 'none'
+    ? 'none'
+    : 'oauth';
+}
+
+function attestedCompiledConnector(release: PackageConnectorReleaseBinding): { target: string; identity: string } | undefined {
+  const entrypoint = release.connectorEntrypoint;
+  const identity = release.connectorArtifactIdentity?.trim();
+  if (!entrypoint && !identity) return undefined;
+  if (entrypoint !== 'forge-mcp-gateway' || !identity || !/^sha256:[a-f0-9]{64}$/i.test(identity)) {
+    throw new Error('FORGE_PACKAGE_CONNECTOR_ARTIFACT_ATTESTATION_INVALID');
+  }
+  const target = resolve(release.releaseRoot, entrypoint);
+  const root = resolve(release.releaseRoot);
+  if (dirname(target) !== root || !existsSync(target)) throw new Error('FORGE_PACKAGE_CONNECTOR_ARTIFACT_MISSING');
+  const status = lstatSync(target);
+  if (!status.isFile() || status.isSymbolicLink()) throw new Error('FORGE_PACKAGE_CONNECTOR_ARTIFACT_INVALID');
+  const actual = `sha256:${createHash('sha256').update(readFileSync(target)).digest('hex')}`;
+  if (actual !== identity.toLowerCase()) throw new Error('FORGE_PACKAGE_CONNECTOR_ARTIFACT_IDENTITY_MISMATCH');
+  return { target, identity: actual };
+}
+
+function stableConnectorEntrypointMatches(path: string, target: string): boolean {
+  try {
+    const current = lstatSync(path);
+    const desired = statSync(target);
+    if (!current.isFile() || current.isSymbolicLink() || !desired.isFile()) return false;
+    if (current.size !== desired.size || (current.mode & 0o777) !== (desired.mode & 0o777)) return false;
+    return readFileSync(path).equals(readFileSync(target));
+  } catch {
+    return false;
+  }
+}
+
+export function syncPackageConnectorActiveEntrypoint(input: { release: PackageConnectorReleaseBinding; controllerHome: string; accountHome?: string }): { path: string; target?: string; artifactIdentity?: string; changed: boolean } {
+  const paths = packageConnectorServicePaths(input.controllerHome, input.accountHome);
+  const artifact = attestedCompiledConnector(input.release);
+  if (!artifact) return { path: paths.activeEntrypointPath, changed: false };
+  if (stableConnectorEntrypointMatches(paths.activeEntrypointPath, artifact.target)) {
+    return { path: paths.activeEntrypointPath, target: artifact.target, artifactIdentity: artifact.identity, changed: false };
+  }
+  mkdirSync(dirname(paths.activeEntrypointPath), { recursive: true, mode: 0o700 });
+  const temporary = `${paths.activeEntrypointPath}.${process.pid}.tmp`;
+  rmSync(temporary, { force: true, recursive: true });
+  try {
+    copyFileSync(artifact.target, temporary);
+    chmodSync(temporary, statSync(artifact.target).mode & 0o777);
+    renameSync(temporary, paths.activeEntrypointPath);
+  } finally {
+    rmSync(temporary, { force: true, recursive: true });
+  }
+  if (!stableConnectorEntrypointMatches(paths.activeEntrypointPath, artifact.target)) {
+    throw new Error('FORGE_PACKAGE_CONNECTOR_STABLE_ENTRYPOINT_MIRROR_FAILED');
+  }
+  return { path: paths.activeEntrypointPath, target: artifact.target, artifactIdentity: artifact.identity, changed: true };
+}
+
+export function packageConnectorLaunchSpec(input: { release: PackageConnectorReleaseBinding; controllerHome: string; endpoint: string; executable?: string }): { executable: string; args: string[]; environment: Record<string, string>; port: number; authMode: PackageConnectorAuthMode } {
   const parsed = new URL(input.endpoint);
   const port = Number(parsed.port);
   if (parsed.protocol !== 'http:' || parsed.hostname !== '127.0.0.1' || parsed.pathname !== '/mcp' || !Number.isInteger(port) || port < 1 || port > 65_535) {
     throw new Error('FORGE_PACKAGE_CONNECTOR_ENDPOINT_INVALID');
   }
-  const executable = resolve(input.executable ?? process.env.FORGE_CONNECTOR_EXECUTABLE ?? process.execPath);
+  const attestedConnector = attestedCompiledConnector(input.release);
+  const legacyCompiledConnector = join(resolve(input.release.releaseRoot), 'forge-mcp-gateway');
+  const hasLegacyCompiledConnector = !attestedConnector && existsSync(legacyCompiledConnector);
+  const hasCompiledConnector = Boolean(attestedConnector) || hasLegacyCompiledConnector;
+  const executable = resolve(attestedConnector
+    ? packageConnectorServicePaths(input.controllerHome).activeEntrypointPath
+    : hasLegacyCompiledConnector
+      ? legacyCompiledConnector
+      : input.executable ?? process.env.FORGE_CONNECTOR_EXECUTABLE ?? process.execPath);
   if (/^forge-recovery-(?:gateway|watchdog)$/i.test(basename(executable))) {
     throw new Error('FORGE_PACKAGE_CONNECTOR_EXECUTABLE_INVALID');
   }
   const packageRoot = resolve(input.release.packageRoot);
   const cliEntry = join(packageRoot, 'src', 'cli', 'index.ts');
   const nodeLoader = join(packageRoot, 'src', 'runtime', 'shared', 'node-ts-loader.mjs');
-  const isBun = Boolean(process.versions.bun) || /(?:^|[/\\-])bun(?:$|[/\\]|\.exe$)/i.test(basename(executable));
+  const executableName = basename(executable);
+  const executableIsCurrentProcess = resolve(executable) === resolve(process.execPath);
+  const isBun = /(?:^|[/\\-])bun(?:$|[/\\]|\.exe$)/i.test(executableName)
+    || (executableIsCurrentProcess && Boolean(process.versions.bun));
+  const instanceId = loadMcpServiceLocalConfig(input.controllerHome)?.identity?.forgeInstanceId?.trim();
+  const authMode = packageConnectorAuthMode(input.controllerHome);
   const cliArgs = [
     // The package snapshot is executable code, never an adopted repository.
     // Supplying it as --repo makes the Gateway try to register a non-Git
     // directory and fail before it can proxy the Canonical Runtime.
     'mcp', 'serve', '--controller-home', resolve(input.controllerHome),
-    '--transport', 'http', '--host', '127.0.0.1', '--port', String(port), '--profile', 'controller', '--auth', 'oauth',
+    '--transport', 'http', '--host', '127.0.0.1', '--port', String(port), '--profile', 'controller', '--auth', authMode,
   ];
   return {
     executable,
-    args: isBun ? [cliEntry, ...cliArgs] : ['--loader', nodeLoader, cliEntry, ...cliArgs],
-    environment: { FORGE_CONTROLLER_HOME: resolve(input.controllerHome), FORGE_CONTROLLER_LIFECYCLE_OWNER: '1' },
+    args: hasCompiledConnector ? cliArgs : isBun ? [cliEntry, ...cliArgs] : ['--loader', nodeLoader, cliEntry, ...cliArgs],
+    environment: {
+      FORGE_CONTROLLER_HOME: resolve(input.controllerHome),
+      FORGE_CONTROLLER_LIFECYCLE_OWNER: '1',
+      ...(instanceId ? { FORGE_MCP_INSTANCE_ID: instanceId } : {}),
+    },
     port,
+    authMode,
   };
 }
 
@@ -182,10 +290,28 @@ export function renderPackageConnectorLaunchAgent(input: { paths: PackageConnect
   return `<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n  <key>Label</key>\n  <string>${xml(input.paths.label)}</string>\n  <key>ProgramArguments</key>\n  <array>\n${args.map((arg) => `    <string>${xml(arg)}</string>`).join('\n')}\n  </array>\n  <key>EnvironmentVariables</key>\n  <dict>\n${environmentXml}\n  </dict>\n  <key>RunAtLoad</key>\n  <true/>\n  <key>KeepAlive</key>\n  <dict><key>SuccessfulExit</key><false/></dict>\n  <key>ThrottleInterval</key><integer>5</integer>\n  <key>StandardOutPath</key><string>${xml(input.paths.stdoutPath)}</string>\n  <key>StandardErrorPath</key><string>${xml(input.paths.stderrPath)}</string>\n</dict>\n</plist>\n`;
 }
 
+export function packageConnectorSystemdUserUnitInput(input: { launch: ReturnType<typeof packageConnectorLaunchSpec> }): SystemdUserUnitInput {
+  const description = input.launch.authMode === 'oauth'
+    ? 'Forge ChatGPT OAuth Gateway'
+    : 'Forge ChatGPT Secure Tunnel Connector';
+  return {
+    description,
+    executable: input.launch.executable,
+    args: input.launch.args,
+    environment: input.launch.environment,
+    restart: 'on-failure',
+    restartSec: 5,
+  };
+}
+
 export function renderPackageConnectorSystemdUserUnit(input: { launch: ReturnType<typeof packageConnectorLaunchSpec> }): string {
-  const quote = (value: string) => `"${value.replaceAll('%', '%%').replaceAll('\\', '\\\\').replaceAll('"', '\\"')}"`;
-  const env = Object.entries(input.launch.environment).sort(([a], [b]) => a.localeCompare(b)).map(([k, v]) => `Environment=${quote(`${k}=${v}`)}`);
-  return ['[Unit]', 'Description=Forge ChatGPT OAuth Gateway', 'After=network-online.target', '', '[Service]', 'Type=simple', `ExecStart=${[input.launch.executable, ...input.launch.args].map(quote).join(' ')}`, ...env, 'Restart=on-failure', 'RestartSec=5', '', '[Install]', 'WantedBy=default.target', ''].join('\n');
+  return createPlatformServiceManagerHost({ platform: 'linux', systemdUserAvailable: true })
+    .renderSystemdUserUnit(packageConnectorSystemdUserUnitInput(input));
+}
+
+/** A rewritten user unit needs an explicit restart; enable --now preserves an already-running old process. */
+export function packageConnectorSystemdInstallCommands(unitName: string): string[][] {
+  return [['--user', 'daemon-reload'], ['--user', 'enable', unitName], ['--user', 'restart', unitName]];
 }
 
 export function packageConnectorServiceMatchesRelease(input: {
@@ -198,9 +324,14 @@ export function packageConnectorServiceMatchesRelease(input: {
   executable?: string;
 }): boolean {
   try {
-    if (
-      input.authority.endpoint !== input.endpoint
-      || input.authority.releaseId !== input.release.releaseId
+    if (input.authority.endpoint !== input.endpoint) return false;
+    const artifact = attestedCompiledConnector(input.release);
+    if (artifact) {
+      const paths = packageConnectorServicePaths(input.controllerHome, input.env?.HOME);
+      if (input.authority.connectorArtifactIdentity !== artifact.identity) return false;
+      if (!stableConnectorEntrypointMatches(paths.activeEntrypointPath, artifact.target)) return false;
+    } else if (
+      input.authority.releaseId !== input.release.releaseId
       || resolve(input.authority.releaseRoot) !== resolve(input.release.releaseRoot)
       || resolve(input.authority.packageRoot) !== resolve(input.release.packageRoot)
     ) return false;
@@ -228,40 +359,33 @@ export function packageConnectorServiceMatchesRelease(input: {
   }
 }
 
-function installSystemd(paths: PackageConnectorServicePaths, launch: ReturnType<typeof packageConnectorLaunchSpec>, env: NodeJS.ProcessEnv): string {
-  const unitName = `${paths.label}.service`;
-  const unitPath = join(env.HOME ?? homedir(), '.config', 'systemd', 'user', unitName);
-  atomicWrite(unitPath, renderPackageConnectorSystemdUserUnit({ launch }), 0o644);
-  for (const args of [['--user', 'daemon-reload'], ['--user', 'enable', '--now', unitName]]) {
-    const result = spawnSync('systemctl', args, { encoding: 'utf8', env, timeout: 30_000 });
-    if (result.status !== 0) throw new Error(`FORGE_PACKAGE_CONNECTOR_SYSTEMD_INSTALL_FAILED: ${(result.stderr || result.stdout || '').trim()}`);
-  }
-  return unitPath;
+function installSystemd(paths: PackageConnectorServicePaths, launch: ReturnType<typeof packageConnectorLaunchSpec>, env: NodeJS.ProcessEnv, host: PlatformServiceManagerHost): string {
+  return host.installSystemdUserUnit({
+    unitName: `${paths.label}.service`,
+    unit: packageConnectorSystemdUserUnitInput({ launch }),
+    env,
+    errorPrefix: 'FORGE_PACKAGE_CONNECTOR_SYSTEMD_INSTALL_FAILED',
+  });
 }
 
-function startPortable(paths: PackageConnectorServicePaths, launch: ReturnType<typeof packageConnectorLaunchSpec>, env: NodeJS.ProcessEnv): number {
-  mkdirSync(join(paths.serviceRoot, 'logs'), { recursive: true, mode: 0o700 });
-  const stdout = openSync(paths.stdoutPath, 'a', 0o600), stderr = openSync(paths.stderrPath, 'a', 0o600);
+function startPortable(paths: PackageConnectorServicePaths, launch: ReturnType<typeof packageConnectorLaunchSpec>, env: NodeJS.ProcessEnv, host: PlatformServiceManagerHost): number {
   // A connector is not the Canonical Runtime writer. Never let a transient
-  // installer/worker write claim escape into this long-lived process; the claim
-  // would become stale as soon as its parent exits. Keep only the explicit
-  // Controller Home and lifecycle-role marker from launch.environment.
-  const childEnv = { ...env };
-  for (const key of [
-    'FORGE_RUNTIME_INSTANCE_ID', 'FORGE_RUNTIME_OWNER_PID', 'FORGE_RELEASE_AUTHORITY_REVISION',
-    'FORGE_RELEASE_FENCING_TOKEN', 'FORGE_RELEASE_ID', 'FORGE_ARTIFACT_IDENTITY', 'FORGE_WORKER_PROTOCOL_VERSION',
-  ]) delete childEnv[key];
-  try {
-    const child = spawn(launch.executable, launch.args, { detached: true, stdio: ['ignore', stdout, stderr], env: { ...childEnv, ...launch.environment } });
-    if (!child.pid) throw new Error('FORGE_PACKAGE_CONNECTOR_START_FAILED');
-    child.unref();
-    return child.pid;
-  } finally { closeSync(stdout); closeSync(stderr); }
+  // installer/worker write claim escape into this long-lived process.
+  const childEnv = runtimeAuthorityFreeEnvironment(env);
+  return host.startDetached({
+    executable: launch.executable,
+    args: launch.args,
+    environment: { ...childEnv, ...launch.environment },
+    stdoutPath: paths.stdoutPath,
+    stderrPath: paths.stderrPath,
+    errorCode: 'FORGE_PACKAGE_CONNECTOR_START_FAILED',
+  });
 }
 
 export async function installPackageConnectorService(input: { release: PackageConnectorReleaseBinding; controllerHome: string; endpoint: string; executable?: string; platform?: NodeJS.Platform; env?: NodeJS.ProcessEnv; forcePortable?: boolean; probeEndpoint?: (endpoint: string) => Promise<boolean> }): Promise<PackageConnectorServiceResult> {
   const paths = packageConnectorServicePaths(input.controllerHome, input.env?.HOME);
   mkdirSync(join(paths.serviceRoot, 'logs'), { recursive: true, mode: 0o700 });
+  syncPackageConnectorActiveEntrypoint({ release: input.release, controllerHome: input.controllerHome, accountHome: input.env?.HOME });
   const launch = packageConnectorLaunchSpec({
     release: input.release,
     controllerHome: input.controllerHome,
@@ -269,33 +393,32 @@ export async function installPackageConnectorService(input: { release: PackageCo
     executable: input.executable,
   });
   const platform = input.platform ?? process.platform, env = input.env ?? process.env;
-  if (!input.forcePortable && platform === 'darwin') {
-    await retireConflictingForgeLaunchAgents({
+  const serviceHost = createPlatformServiceManagerHost({ platform, env, forcePortable: input.forcePortable });
+  const serviceManager = serviceHost.selection;
+  if (serviceManager.kind === 'launchd') {
+    await serviceHost.retireConflictingLaunchd({
       accountHome: env.HOME,
       desiredLabel: paths.label,
       labelPrefix: 'com.moretea.forge.mcp-gateway',
       port: launch.port,
-      requiredArguments: ['mcp', 'serve', '--auth', 'oauth'],
+      requiredArguments: ['mcp', 'serve', '--auth', launch.authMode],
     });
     atomicWrite(paths.sourcePlistPath, renderPackageConnectorLaunchAgent({ paths, launch }), 0o600);
-    installLaunchAgent(paths.sourcePlistPath, paths.label);
-    const result = await bootstrapLaunchAgentWithRetryV2({ label: paths.label, plistPath: paths.installedPlistPath });
+    serviceHost.installLaunchd(paths.sourcePlistPath, paths.label);
+    const result = await serviceHost.bootstrapLaunchd({ label: paths.label, plistPath: paths.installedPlistPath });
     if (!result.ok) throw new Error(`FORGE_PACKAGE_CONNECTOR_LAUNCHD_INSTALL_FAILED: ${result.diagnostics.join('; ')}`);
-    const endpointReady = await waitForPackageConnectorEndpointReady(input.endpoint, { probeEndpoint: input.probeEndpoint });
+    const endpointReady = await waitForPackageConnectorEndpointReady(input.endpoint, { authMode: launch.authMode, probeEndpoint: input.probeEndpoint });
     if (!endpointReady) throw new Error(`FORGE_PACKAGE_CONNECTOR_ENDPOINT_NOT_READY: ${input.endpoint}`);
     const installed = { endpoint: input.endpoint, mode: 'launchd' as const, persistent: true, servicePath: paths.installedPlistPath, releaseId: input.release.releaseId, releaseRoot: input.release.releaseRoot };
     writePackageConnectorServiceAuthority({ release: input.release, controllerHome: input.controllerHome, result: installed });
     return installed;
   }
-  if (!input.forcePortable && platform === 'linux') {
-    const probe = spawnSync('systemctl', ['--user', 'show-environment'], { encoding: 'utf8', env, timeout: 30_000 });
-    if (probe.status === 0) {
-      const installed = { endpoint: input.endpoint, mode: 'systemd-user' as const, persistent: true, servicePath: installSystemd(paths, launch, env), releaseId: input.release.releaseId, releaseRoot: input.release.releaseRoot };
-      writePackageConnectorServiceAuthority({ release: input.release, controllerHome: input.controllerHome, result: installed });
-      return installed;
-    }
+  if (serviceManager.kind === 'systemd-user') {
+    const installed = { endpoint: input.endpoint, mode: 'systemd-user' as const, persistent: true, servicePath: installSystemd(paths, launch, env, serviceHost), releaseId: input.release.releaseId, releaseRoot: input.release.releaseRoot };
+    writePackageConnectorServiceAuthority({ release: input.release, controllerHome: input.controllerHome, result: installed });
+    return installed;
   }
-  const portable = { endpoint: input.endpoint, mode: 'portable' as const, persistent: false, pid: startPortable(paths, launch, env), releaseId: input.release.releaseId, releaseRoot: input.release.releaseRoot };
+  const portable = { endpoint: input.endpoint, mode: 'portable' as const, persistent: false, pid: startPortable(paths, launch, env, serviceHost), releaseId: input.release.releaseId, releaseRoot: input.release.releaseRoot };
   writePackageConnectorServiceAuthority({ release: input.release, controllerHome: input.controllerHome, result: portable });
   return portable;
 }
@@ -312,15 +435,17 @@ export async function ensurePackageConnectorService(input: {
   probeEndpoint?: (endpoint: string) => Promise<boolean>;
 }): Promise<PackageConnectorServiceResult> {
   const platform = input.platform ?? process.platform;
+  const authMode = packageConnectorAuthMode(input.controllerHome);
   if (!input.refresh && !input.forcePortable && platform === 'darwin') {
     const paths = packageConnectorServicePaths(input.controllerHome, input.env?.HOME);
     const port = Number(new URL(input.endpoint).port);
-    await retireConflictingForgeLaunchAgents({
+    const serviceHost = createPlatformServiceManagerHost({ platform, env: input.env });
+    await serviceHost.retireConflictingLaunchd({
       accountHome: input.env?.HOME,
       desiredLabel: paths.label,
       labelPrefix: 'com.moretea.forge.mcp-gateway',
       port,
-      requiredArguments: ['mcp', 'serve', '--auth', 'oauth'],
+      requiredArguments: ['mcp', 'serve', '--auth', authMode],
     });
   }
   if (!input.refresh && !input.forcePortable) {
@@ -341,15 +466,28 @@ export async function ensurePackageConnectorService(input: {
       })
       && await (input.probeEndpoint ?? defaultConnectorEndpointProbe)(input.endpoint)
     ) {
-      return {
+      const rebound = authority.releaseId !== input.release.releaseId
+        || resolve(authority.releaseRoot) !== resolve(input.release.releaseRoot)
+        || resolve(authority.packageRoot) !== resolve(input.release.packageRoot);
+      const reused: PackageConnectorServiceResult = {
         endpoint: authority.endpoint,
         mode: authority.mode,
         persistent: true,
         ...(authority.servicePath ? { servicePath: authority.servicePath } : {}),
         reused: true,
-        releaseId: authority.releaseId,
-        releaseRoot: authority.releaseRoot,
+        ...(rebound ? { rebound: true } : {}),
+        releaseId: input.release.releaseId,
+        releaseRoot: input.release.releaseRoot,
       };
+      if (rebound) {
+        writePackageConnectorServiceAuthority({
+          release: input.release,
+          controllerHome: input.controllerHome,
+          result: reused,
+          installedAt: authority.installedAt,
+        });
+      }
+      return reused;
     }
   }
   return installPackageConnectorService(input);