@goodandready/dsh-moa 0.2.60 → 0.2.62

package/lib/index.js

@@ -1,3 +1,4 @@
+import { service, getWebServerPort } from './services.js'
 import crypto from 'node:crypto'
 import path from 'node:path'
 import { setLogger, logger } from './logger.js'
@@ -24,7 +25,7 @@ import { getMoaHistory } from './history.js'
 
 export const name = '@goodandready/dsh-moa'
 export { collectProjectContext, formatProjectContext } from './file-workspace.js'
-export const inject = ['webServer', 'llm', 'sessions', 'tools']
+export const inject = ['llm']
 export const NS = 'dsh-moa'
 
 export {
@@ -129,29 +130,42 @@ export function apply(ctx, config) {
   // Optional Live Canvas preview client: the harness port is resolved per
   // call and any failure degrades to "no preview link" (live-canvas is not
   // required to be installed).
-  const liveCanvas = createLiveCanvasClient({ getPort: () => ctx.webServer?.port })
+  const liveCanvas = createLiveCanvasClient({ getPort: () => getWebServerPort(ctx) })
 
-  // Route: /dsh-moa/status
-  // Register one-click updater endpoint
-  ctx.effect(() => {
-    return registerPluginUpdater(ctx, {
-      endpoint: '/api/dsh-moa/update',
-      packageName: '@goodandready/dsh-moa',
-      manifestUrl: new URL('../package.json', import.meta.url),
+  // Route: /dsh-moa/status & one-click updater
+  const registerWebSurfaces = (targetCtx) => {
+    if (!targetCtx) return
+    const ws = service(targetCtx, 'webServer') || service(ctx, 'webServer')
+    if (!ws || typeof ws.register !== 'function') return
+
+    const eff = typeof targetCtx.effect === 'function' ? targetCtx.effect : (typeof ctx.effect === 'function' ? ctx.effect : (fn) => fn())
+    eff(() => {
+      return registerPluginUpdater(targetCtx, {
+        endpoint: '/api/dsh-moa/update',
+        packageName: '@goodandready/dsh-moa',
+        manifestUrl: new URL('../package.json', import.meta.url),
+      })
+    }, 'dsh-moa: plugin updater route')
+
+    registerMoaRoutes(targetCtx, {
+      live,
+      callLlm,
+      liveCanvas,
+      saveConfig,
+      Config,
+      plainConfig,
+      webServerPort: getWebServerPort(targetCtx) || getWebServerPort(ctx),
+      timeMachineEngine: service(targetCtx, 'timeMachineEngine') || service(ctx, 'timeMachineEngine') || ctx.reflect?.get?.('timeMachineEngine', false),
     })
-  }, 'dsh-moa: plugin updater route')
+  }
 
-  // Route dispatch: req.method verified fail-closed in lib/routes.js
-  registerMoaRoutes(ctx, {
-    live,
-    callLlm,
-    liveCanvas,
-    saveConfig,
-    Config,
-    plainConfig,
-    webServerPort: ctx.webServer?.port,
-    timeMachineEngine: ctx.reflect?.get?.('timeMachineEngine', false),
-  })
+  if (service(ctx, 'webServer')) {
+    registerWebSurfaces(ctx)
+  } else if (typeof ctx.inject === 'function') {
+    ctx.inject(['webServer'], (webCtx) => {
+      registerWebSurfaces(webCtx)
+    })
+  }
 
   // Session turn interceptor: route turn to real aggregator model & stream MoA synthesis
   ctx.effect(() => {
@@ -221,8 +235,8 @@ export function apply(ctx, config) {
               runId: promoteRunId,
               candidateIndex: parsed.candidateIndex,
               cwd: sessCwd,
-              webServerPort: ctx.webServer?.port,
-              timeMachineEngine: ctx.reflect?.get?.('timeMachineEngine', false),
+              webServerPort: getWebServerPort(ctx),
+              timeMachineEngine: service(ctx, 'timeMachineEngine') || ctx.reflect?.get?.('timeMachineEngine', false),
             }
             if (event.signal) moaPendingTurns.set(event.signal, turnContext)
             if (event.session?.id) setSessionTurn(event.session.id, turnContext)
@@ -270,8 +284,8 @@ export function apply(ctx, config) {
             callLlm,
             prices: cfg.prices || {},
             liveCanvas,
-            webServerPort: ctx.webServer?.port,
-            timeMachineEngine: ctx.reflect?.get?.('timeMachineEngine', false),
+            webServerPort: getWebServerPort(ctx),
+            timeMachineEngine: service(ctx, 'timeMachineEngine') || ctx.reflect?.get?.('timeMachineEngine', false),
           }
 
           if (event.signal) {