@huynle/hub 0.8.7 → 0.9.1

package/packages/node/src/run.ts

@@ -7,7 +7,9 @@
 // node keeps OpenCode's background service and node.json's foreground servers warm (opencode-warm.ts) so their hub
 // plugin loads without a client opening a project. Exit codes: 0 after a clean stop, 1 when
 // the machine is not enrolled, EXIT_CONFIG (78, EX_CONFIG) when node.json gives the node nothing to do; the
-// service units do not restart on 78.
+// service units do not restart on 78. On Windows (Phase 3) the logon task restarts the node whatever its exit code,
+// so a node with nothing to do waits there, re-reading node.json, instead of exiting; and while it offers opencode the node starts OpenCode's
+// background service when none is registered (opencode-service.ts), since nothing else keeps it running there.
 import { homedir } from "node:os"
 import path from "node:path"
 import type { NodeLaunchReport } from "../../protocol/src/index.ts"
@@ -15,8 +17,9 @@ import { OpenShellCli } from "../../runtime-openshell/src/cli.ts"
 import type { Runtime } from "../../runtime-sdk/src/index.ts"
 import { nodeConfigPath, readNodeConfig, readSpokeCredentials, type NodeConfig, type SpokeCredentials } from "./config.ts"
 import { NodeDaemon, NODE_VERSION } from "./daemon.ts"
-import { detectHarnesses } from "./harnesses.ts"
+import { detectHarnesses, findExecutable, opencodeBinary } from "./harnesses.ts"
 import { HostRuntime } from "./host.ts"
+import { OpenCodeServiceStarter, serviceDiscovery, type StartRun } from "./opencode-service.ts"
 import { OpenCodeWarmer, readServiceRegistration, serverEndpoint, type WarmEndpoint } from "./opencode-warm.ts"
 import { createOpenShellRuntime, openshellBackends, PROBE_TIMEOUT_MS, sweepSandboxes } from "./openshell.ts"
 
@@ -35,8 +38,30 @@ export interface RunNodeOptions {
   readonly openshellBinary?: string
   /** Finds OpenCode's background service (default: readServiceRegistration on this env's registration file). */
   readonly openCodeService?: () => Promise<WarmEndpoint | undefined>
+  /** The platform (default this one): win32 exits 0 for "nothing to do" and starts OpenCode's service. */
+  readonly platform?: string
+  /** win32: the OpenCode executable (default opencodeBinary found like a harness), undefined when not installed. */
+  readonly openCodeBinary?: () => string | undefined
+  /** win32: how `opencode service start` runs (default opencode-service.ts startRun). */
+  readonly startOpenCode?: StartRun
+  /** win32: how often a node with nothing to do re-reads node.json (default IDLE_RECHECK_MS). */
+  readonly idleRecheckMs?: number
 }
 
+/** win32: how often a node with no workspace roots re-reads node.json while it waits. */
+export const IDLE_RECHECK_MS = 60_000
+
+const sleep = (ms: number, signal: AbortSignal) =>
+  new Promise<void>((resolve) => {
+    const timer = setTimeout(done, ms)
+    function done() {
+      clearTimeout(timer)
+      signal.removeEventListener("abort", done)
+      resolve()
+    }
+    signal.addEventListener("abort", done, { once: true })
+  })
+
 /** OpenCode's service registration file for `env` and `home` (@opencode/client's default location). */
 export const openCodeServiceFile = (env: Env, home: string): string =>
   path.join(env.XDG_STATE_HOME || path.join(home, ".local", "state"), "opencode", "service.json")
@@ -88,6 +113,7 @@ async function setupOpenShell(config: NodeConfig, credentials: SpokeCredentials,
 export async function runNode(options: RunNodeOptions): Promise<number> {
   const env = options.env ?? process.env
   const home = options.home ?? homedir()
+  const platform = options.platform ?? process.platform
   const log = options.log ?? ((line: string) => process.stderr.write(`[hub node] ${line}\n`))
 
   const credentials = readSpokeCredentials(env, home)
@@ -96,11 +122,21 @@ export async function runNode(options: RunNodeOptions): Promise<number> {
     return 1
   }
   const file = nodeConfigPath(env, home)
-  const { config, problems } = readNodeConfig(file)
+  let { config, problems } = readNodeConfig(file, { platform, home })
   for (const problem of problems) log(`${file}: ${problem}`)
   if (config.workspaceRoots.length === 0) {
     log(`${file} lists no workspaceRoots, so this node can prepare no workspaces; add e.g. {"workspaceRoots": ["${home}/projects"]}`)
-    return EXIT_CONFIG
+    if (platform !== "win32") return EXIT_CONFIG
+    // Task Scheduler restarts the logon task whatever the exit code (its repetition trigger), so a node with nothing to
+    // do waits here, re-reading node.json, instead of exiting and being started again every minute.
+    log(`waiting: re-reading ${file} every ${Math.round((options.idleRecheckMs ?? IDLE_RECHECK_MS) / 1000)} s until it lists workspaceRoots`)
+    while (config.workspaceRoots.length === 0) {
+      await sleep(options.idleRecheckMs ?? IDLE_RECHECK_MS, options.signal)
+      if (options.signal.aborted) return 0
+      ;({ config, problems } = readNodeConfig(file, { platform, home }))
+    }
+    for (const problem of problems) log(`${file}: ${problem}`)
+    log(`workspace roots now set in ${file}; starting`)
   }
 
   if (options.signal.aborted) return 0
@@ -122,7 +158,16 @@ export async function runNode(options: RunNodeOptions): Promise<number> {
   })
   log(`hub node ${NODE_VERSION}: ${config.slots} slots, roots ${config.workspaceRoots.join(", ")}; host harnesses ${harnesses.join(", ") || "none"}`)
   daemon.start()
-  if (harnesses.includes("opencode")) startOpenCodeWarmers(config, options.openCodeService ?? (() => readServiceRegistration(openCodeServiceFile(env, home))), log, options.signal)
+  if (harnesses.includes("opencode")) {
+    const read = options.openCodeService ?? (() => readServiceRegistration(openCodeServiceFile(env, home)))
+    const starter = new OpenCodeServiceStarter({
+      binary: options.openCodeBinary ?? (() => findExecutable(opencodeBinary(env, home, platform), env, platform)),
+      log,
+      env,
+      ...(options.startOpenCode ? { run: options.startOpenCode } : {}),
+    })
+    startOpenCodeWarmers(config, serviceDiscovery(read, starter, platform), log, options.signal)
+  }
   await new Promise<void>((resolve) => {
     if (options.signal.aborted) return resolve()
     options.signal.addEventListener("abort", () => resolve(), { once: true })

package/packages/preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huynle/hub-preset",
-  "version": "0.8.7",
+  "version": "0.9.1",
   "private": true,
   "description": "The preset spoke: drives a harness without a spoke of its own through a terminal pane (tmux), described by a data-only preset; official presets in presets/ (internal; shipped inside @huynle/hub, not published on its own).",
   "license": "MIT",

package/packages/protocol/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huynle/hub-protocol",
-  "version": "0.8.7",
+  "version": "0.9.1",
   "private": true,
   "description": "Hub ↔ spoke wire protocol (internal; shipped inside @huynle/hub, not published on its own).",
   "license": "MIT",