refactor(hosted-runtime): isolate installer composition

Author: 777genius

src/features/hosted-opencode-runtime/core/domain/hostedOpenCodeRuntimeLock.ts

@@ -18,6 +18,22 @@ export const HOSTED_OPENCODE_RUNTIME_PLATFORM_KEYS = [
 export type HostedOpenCodeRuntimePlatformKey =
   (typeof HOSTED_OPENCODE_RUNTIME_PLATFORM_KEYS)[number];
 
+export const HOSTED_OPENCODE_CURRENT_MANIFEST_SCHEMA_VERSION = 2 as const;
+
+export interface HostedOpenCodeCurrentManifestV2 {
+  readonly schemaVersion: 2;
+  readonly runtime: 'opencode';
+  readonly version: string;
+  readonly tag: string;
+  readonly platform: HostedOpenCodeRuntimePlatformKey;
+  readonly binaryPath: string;
+  readonly assetUrl: string;
+  readonly archiveSha256: string;
+  readonly binarySha256: string;
+  readonly sourceCommit: string;
+  readonly installedAt: string;
+}
+
 export interface HostedOpenCodeRuntimeAvailableArtifact {
   readonly status: 'available';
   readonly file: string;

src/features/hosted-opencode-runtime/index.ts

@@ -1,12 +1,14 @@
 export {
-  hostedOpenCodeRuntimePlatformKey,
-  type HostedOpenCodeRuntimeArtifact,
-  type HostedOpenCodeRuntimeAvailableArtifact,
-  type HostedOpenCodeRuntimeLockV2,
-  type HostedOpenCodeRuntimePlatformKey,
+  HOSTED_OPENCODE_CURRENT_MANIFEST_SCHEMA_VERSION,
   HOSTED_OPENCODE_RUNTIME_LOCK_SCHEMA_VERSION,
   HOSTED_OPENCODE_RUNTIME_PLATFORM_KEYS,
   HOSTED_OPENCODE_RUNTIME_SOURCE,
   HOSTED_OPENCODE_RUNTIME_VERSION,
+  type HostedOpenCodeCurrentManifestV2,
+  type HostedOpenCodeRuntimeArtifact,
+  type HostedOpenCodeRuntimeAvailableArtifact,
+  type HostedOpenCodeRuntimeLockV2,
+  type HostedOpenCodeRuntimePlatformKey,
+  hostedOpenCodeRuntimePlatformKey,
   parseHostedOpenCodeRuntimeLock,
 } from './core/domain/hostedOpenCodeRuntimeLock';

src/features/hosted-opencode-runtime/main/composition/hostedOpenCodeRuntimeComposition.ts

@@ -1,8 +1,16 @@
-import {
-  type HostedOpenCodeCurrentManifestV2,
-  installHostedOpenCodeRuntime,
-  resolveHostedOpenCodeRuntimeBinary,
-} from '../infrastructure/HostedOpenCodeRuntimeInstaller';
+import type { HostedOpenCodeCurrentManifestV2 } from '@features/hosted-opencode-runtime';
+
+export interface HostedOpenCodeRuntimeInstallRequest {
+  readonly runtimeRoot: string;
+  readonly lock: unknown;
+  readonly platform?: NodeJS.Platform;
+  readonly arch?: string;
+}
+
+export interface HostedOpenCodeRuntimeInstallerPort {
+  install(input: HostedOpenCodeRuntimeInstallRequest): Promise<HostedOpenCodeCurrentManifestV2>;
+  resolveBinary(input: HostedOpenCodeRuntimeInstallRequest): Promise<string>;
+}
 
 export interface HostedOpenCodeRuntimeComposition {
   install(): Promise<HostedOpenCodeCurrentManifestV2>;
@@ -14,6 +22,7 @@ export interface HostedOpenCodeRuntimeCompositionInput {
   readonly loadLock: () => Promise<unknown>;
   readonly platform?: NodeJS.Platform;
   readonly arch?: string;
+  readonly installer: HostedOpenCodeRuntimeInstallerPort;
 }
 
 export function createHostedOpenCodeRuntimeComposition(
@@ -27,10 +36,10 @@ export function createHostedOpenCodeRuntimeComposition(
   });
   return Object.freeze({
     async install() {
-      return installHostedOpenCodeRuntime(await common());
+      return input.installer.install(await common());
     },
     async resolveBinary() {
-      return resolveHostedOpenCodeRuntimeBinary(await common());
+      return input.installer.resolveBinary(await common());
     },
   });
 }

src/features/hosted-opencode-runtime/main/index.ts

@@ -2,4 +2,6 @@ export {
   createHostedOpenCodeRuntimeComposition,
   type HostedOpenCodeRuntimeComposition,
   type HostedOpenCodeRuntimeCompositionInput,
+  type HostedOpenCodeRuntimeInstallerPort,
+  type HostedOpenCodeRuntimeInstallRequest,
 } from './composition/hostedOpenCodeRuntimeComposition';

src/main/composition/hosted/hostedOpenCodeRuntimeComposition.ts

@@ -3,6 +3,11 @@ import {
   type HostedOpenCodeRuntimeComposition as FeatureHostedOpenCodeRuntimeComposition,
 } from '@features/hosted-opencode-runtime/main';
 
+import {
+  installHostedOpenCodeRuntime,
+  resolveHostedOpenCodeRuntimeBinary,
+} from './infrastructure/HostedOpenCodeRuntimeInstaller';
+
 export type HostedOpenCodeRuntimeComposition = FeatureHostedOpenCodeRuntimeComposition;
 
 export function createHostedOpenCodeRuntimeComposition(input: {
@@ -11,5 +16,11 @@ export function createHostedOpenCodeRuntimeComposition(input: {
   readonly platform?: NodeJS.Platform;
   readonly arch?: string;
 }): HostedOpenCodeRuntimeComposition {
-  return createFeatureHostedOpenCodeRuntimeComposition(input);
+  return createFeatureHostedOpenCodeRuntimeComposition({
+    ...input,
+    installer: {
+      install: installHostedOpenCodeRuntime,
+      resolveBinary: resolveHostedOpenCodeRuntimeBinary,
+    },
+  });
 }

…ucture/HostedOpenCodeRuntimeInstaller.ts …ucture/HostedOpenCodeRuntimeInstaller.tssrc/features/hosted-opencode-runtime/main/infrastructure/HostedOpenCodeRuntimeInstaller.ts renamed to src/main/composition/hosted/infrastructure/HostedOpenCodeRuntimeInstaller.ts src/features/hosted-opencode-runtime/main/infrastructure/HostedOpenCodeRuntimeInstaller.ts renamed to src/main/composition/hosted/infrastructure/HostedOpenCodeRuntimeInstaller.ts

@@ -3,37 +3,24 @@ import { promises as fs } from 'node:fs';
 import path from 'node:path';
 
 import {
-  hostedOpenCodeRuntimePlatformKey,
+  HOSTED_OPENCODE_CURRENT_MANIFEST_SCHEMA_VERSION,
+  type HostedOpenCodeCurrentManifestV2,
   type HostedOpenCodeRuntimeAvailableArtifact,
   type HostedOpenCodeRuntimeLockV2,
   type HostedOpenCodeRuntimePlatformKey,
+  hostedOpenCodeRuntimePlatformKey,
   parseHostedOpenCodeRuntimeLock,
-} from '../../core/domain/hostedOpenCodeRuntimeLock';
+} from '@features/hosted-opencode-runtime';
 import { atomicWriteAsync, renamePathWithRetry } from '@main/utils/atomicWrite';
 import { execCli } from '@main/utils/childProcess';
 
 import { extractHostedOpenCodeBinary } from './hostedOpenCodeArchive';
 
-export const HOSTED_OPENCODE_CURRENT_MANIFEST_SCHEMA_VERSION = 2 as const;
 const MAX_ARCHIVE_BYTES = 250 * 1024 * 1024;
 const FETCH_TIMEOUT_MS = 60_000;
 const VERSION_TIMEOUT_MS = 30_000;
 const installInFlight = new Map<string, Promise<HostedOpenCodeCurrentManifestV2>>();
 
-export interface HostedOpenCodeCurrentManifestV2 {
-  readonly schemaVersion: 2;
-  readonly runtime: 'opencode';
-  readonly version: string;
-  readonly tag: string;
-  readonly platform: HostedOpenCodeRuntimePlatformKey;
-  readonly binaryPath: string;
-  readonly assetUrl: string;
-  readonly archiveSha256: string;
-  readonly binarySha256: string;
-  readonly sourceCommit: string;
-  readonly installedAt: string;
-}
-
 export interface HostedOpenCodeRuntimeInstallerOptions {
   readonly runtimeRoot: string;
   readonly lock: unknown;

…/infrastructure/hostedOpenCodeArchive.ts …/infrastructure/hostedOpenCodeArchive.tssrc/features/hosted-opencode-runtime/main/infrastructure/hostedOpenCodeArchive.ts renamed to src/main/composition/hosted/infrastructure/hostedOpenCodeArchive.ts src/features/hosted-opencode-runtime/main/infrastructure/hostedOpenCodeArchive.ts renamed to src/main/composition/hosted/infrastructure/hostedOpenCodeArchive.ts

@@ -5,15 +5,15 @@ import path from 'node:path';
 import { gzipSync } from 'node:zlib';
 
 import {
+  type HostedOpenCodeRuntimeLockV2,
   hostedOpenCodeRuntimePlatformKey,
   parseHostedOpenCodeRuntimeLock,
-  type HostedOpenCodeRuntimeLockV2,
 } from '../../../src/features/hosted-opencode-runtime';
+import { extractHostedOpenCodeBinary } from '../../../src/main/composition/hosted/infrastructure/hostedOpenCodeArchive';
 import {
   installHostedOpenCodeRuntime,
   resolveHostedOpenCodeRuntimeBinary,
-} from '../../../src/features/hosted-opencode-runtime/main/infrastructure/HostedOpenCodeRuntimeInstaller';
-import { extractHostedOpenCodeBinary } from '../../../src/features/hosted-opencode-runtime/main/infrastructure/hostedOpenCodeArchive';
+} from '../../../src/main/composition/hosted/infrastructure/HostedOpenCodeRuntimeInstaller';
 
 const SOURCE = {
   repository: '777genius/opencode-anomaly',