@openpalm/lib 0.9.6 → 0.9.7

package/src/control-plane/lifecycle.ts

@@ -16,7 +16,7 @@ import type { ControlPlaneState, CallerType } from "./types.js";
 import { CORE_SERVICES } from "./types.js";
 import { resolveConfigHome, resolveStateHome, resolveDataHome } from "./paths.js";
 import { loadSecretsEnvFile } from "./secrets.js";
-import { stageArtifacts, persistArtifacts, discoverStagedChannelYmls, randomHex, isOllamaEnabled } from "./staging.js";
+import { stageArtifacts, persistArtifacts, discoverStagedChannelYmls, randomHex, isOllamaEnabled, isAdminEnabled } from "./staging.js";
 import { refreshCoreAssets, ensureMemoryDir, ensureCoreAutomations } from "./core-assets.js";
 import { ensureMemoryConfig } from "./memory-config.js";
 import { isSetupComplete } from "./setup-status.js";
@@ -222,6 +222,11 @@ export async function applyUpgrade(
 export function buildComposeFileList(state: ControlPlaneState): string[] {
   const files = [`${state.stateDir}/artifacts/docker-compose.yml`];
 
+  if (isAdminEnabled(state)) {
+    const adminYml = `${state.stateDir}/artifacts/admin.yml`;
+    files.push(adminYml);
+  }
+
   if (isOllamaEnabled(state)) {
     const ollamaYml = `${state.stateDir}/artifacts/ollama.yml`;
     files.push(ollamaYml);
@@ -235,11 +240,15 @@ export function buildComposeFileList(state: ControlPlaneState): string[] {
 
 /**
  * Build the list of services that `docker compose up` should manage.
- * Core services only — admin/docker-socket-proxy are in the "admin" profile.
+ * Core services always; admin/caddy/docker-socket-proxy only when admin is enabled.
  */
 export function buildManagedServices(state: ControlPlaneState): string[] {
   const services: string[] = [...CORE_SERVICES];
 
+  if (isAdminEnabled(state)) {
+    services.push("caddy", "admin", "docker-socket-proxy");
+  }
+
   if (isOllamaEnabled(state)) {
     services.push("ollama");
   }

package/src/control-plane/model-runner.ts

@@ -17,7 +17,25 @@ export type LocalProviderDetection = {
 
 // ── Probe Configuration ──────────────────────────────────────────────────
 
-const LOCAL_PROVIDER_PROBES: { provider: string; probes: { url: string; baseUrl: string }[] }[] = [
+type ProviderProbe = {
+  url: string;
+  baseUrl: string;
+  /** Optional response validator — when present, the probe only succeeds if this returns true. */
+  validate?: (res: Response) => Promise<boolean>;
+};
+
+/** Ollama's root endpoint returns "Ollama is running" — use this to distinguish from other services on :11434. */
+async function validateOllamaResponse(res: Response): Promise<boolean> {
+  try {
+    const body = await res.json();
+    // Ollama /api/tags returns { models: [...] } — verify shape
+    return body != null && Array.isArray(body.models);
+  } catch {
+    return false;
+  }
+}
+
+const LOCAL_PROVIDER_PROBES: { provider: string; probes: ProviderProbe[] }[] = [
   {
     provider: "model-runner",
     probes: [
@@ -46,14 +64,17 @@ const LOCAL_PROVIDER_PROBES: { provider: string; probes: { url: string; baseUrl:
         // In-stack Ollama (compose service on assistant_net)
         url: "http://ollama:11434/api/tags",
         baseUrl: "http://ollama:11434",
+        validate: validateOllamaResponse,
       },
       {
         url: "http://host.docker.internal:11434/api/tags",
         baseUrl: "http://host.docker.internal:11434",
+        validate: validateOllamaResponse,
       },
       {
         url: "http://localhost:11434/api/tags",
         baseUrl: "http://localhost:11434",
+        validate: validateOllamaResponse,
       },
     ],
   },
@@ -81,12 +102,16 @@ const LOCAL_PROVIDER_PROBES: { provider: string; probes: { url: string; baseUrl:
 export async function detectLocalProviders(): Promise<LocalProviderDetection[]> {
   const results = await Promise.all(
     LOCAL_PROVIDER_PROBES.map(async ({ provider, probes }) => {
-      for (const { url: probeUrl, baseUrl } of probes) {
+      for (const { url: probeUrl, baseUrl, validate } of probes) {
         try {
           const res = await fetch(probeUrl, {
             signal: AbortSignal.timeout(3000),
           });
           if (res.ok) {
+            if (validate && !(await validate(res))) {
+              logger.debug("provider probe response failed validation", { provider, url: baseUrl });
+              continue;
+            }
             logger.debug("detected local provider", { provider, url: baseUrl });
             return { provider, url: baseUrl, available: true };
           }

package/src/control-plane/setup-status.ts

@@ -27,5 +27,5 @@ export function isSetupComplete(stateDir: string, configDir: string): boolean {
   }
 
   const keys = readSecretsKeys(configDir);
-  return keys.ADMIN_TOKEN === true;
+  return keys.OPENPALM_ADMIN_TOKEN === true || keys.ADMIN_TOKEN === true;
 }