@pleri/olam-cli 0.1.146 → 0.1.148

package/host-cp/k8s/manifests/memory-service/10-serviceaccount.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: olam-memory-service
+  namespace: olam
+  labels:
+    app: olam-memory-service
+    olam.io/component: peripheral

package/host-cp/k8s/manifests/memory-service/20-rbac.yaml

@@ -0,0 +1,34 @@
+# Phase 1a Decision 19: Role scoped to resourceNames: ["olam-memory-service"] on
+# apps/v1 deployments. Without this scope, the in-cluster ServiceAccount
+# could patch ANY Deployment in the namespace. This is the load-bearing
+# security guardrail — preserve verbatim.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: olam-memory-service
+  namespace: olam
+  labels:
+    app: olam-memory-service
+    olam.io/component: peripheral
+rules:
+  - apiGroups: ["apps"]
+    resources: ["deployments"]
+    resourceNames: ["olam-memory-service"]
+    verbs: ["get", "patch", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: olam-memory-service
+  namespace: olam
+  labels:
+    app: olam-memory-service
+    olam.io/component: peripheral
+subjects:
+  - kind: ServiceAccount
+    name: olam-memory-service
+    namespace: olam
+roleRef:
+  kind: Role
+  name: olam-memory-service
+  apiGroup: rbac.authorization.k8s.io

package/host-cp/k8s/manifests/memory-service/30-configmap.yaml

@@ -0,0 +1,20 @@
+# ConfigMap for olam-memory-service environment. Sensitive values live in
+# the Secret (see templates/memory-service-secret-template.yaml).
+# Operators apply the Secret separately before applying the manifests.
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: olam-memory-service-env
+  namespace: olam
+  labels:
+    app: olam-memory-service
+    olam.io/component: peripheral
+data:
+  # Port memory-service listens on. Must match 60-service.yaml targetPort.
+  OLAM_MEMORY_PORT: "3111"
+  # Data directory — backed by the PVC mounted at /data.
+  OLAM_MEMORY_DATA_PATH: "/data/memory"
+  # URL of auth-service (cluster-internal DNS). Override in non-k3d environments.
+  OLAM_AUTH_SERVICE_URL: "http://olam-auth-service.olam.svc.cluster.local:9999"
+  # Health path exposed at /agentmemory/livez (D15 — do not change).
+  OLAM_MEMORY_HEALTH_PATH: "/agentmemory/livez"

package/host-cp/k8s/manifests/memory-service/45-pvc.yaml

@@ -0,0 +1,25 @@
+# PersistentVolumeClaim for olam-memory-service /data volume.
+#
+# Why PVC instead of hostPath: see packages/host-cp/k8s/manifests/host-cp/45-pvc.yaml
+# for the full rationale (fsGroup, k3d node filesystem, etc.).
+#
+# local-path StorageClass ships with k3d by default (rancher/local-path-provisioner).
+# On non-k3d clusters, substitute storageClassName with your cluster's provisioner.
+# D24: storageClassName operator-editable — edit the field below for non-k3d substrates.
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: olam-memory-data
+  namespace: olam
+  labels:
+    app: olam-memory-service
+    olam.io/component: peripheral
+spec:
+  accessModes:
+    - ReadWriteOnce
+  # D24: operator-editable. k3d default is local-path. Change for non-k3d substrates.
+  storageClassName: local-path
+  resources:
+    requests:
+      # D25: memory-service PVC size 5Gi.
+      storage: 5Gi

package/host-cp/k8s/manifests/memory-service/50-deployment.yaml

@@ -0,0 +1,116 @@
+# Deployment for olam-memory-service.
+#
+# Image: pinned to sha256 digest (not :latest or named tag) per T4 threat model.
+# Digest resolves to ghcr.io/pleri/olam-memory-service:0.1.0 (multi-arch index).
+# To update: resolve the new tag's digest via:
+#   TOKEN=$(curl -s "https://ghcr.io/token?scope=repository:pleri/olam-memory-service:pull&service=ghcr.io" | jq -r .token)
+#   curl -sI -H "Authorization: Bearer $TOKEN" \
+#     -H "Accept: application/vnd.oci.image.index.v1+json,application/vnd.docker.distribution.manifest.list.v2+json" \
+#     https://ghcr.io/v2/pleri/olam-memory-service/manifests/<tag> | grep docker-content-digest
+#
+# securityContext: conservative defaults per T6/T7 threat model (runAsNonRoot,
+# readOnlyRootFilesystem). /tmp backed by emptyDir for transient write needs.
+#
+# D15 (LOAD-BEARING): readinessProbe and livenessProbe path MUST be
+# /agentmemory/livez (not /health). Source: DEFAULT_HEALTH_PATH in
+# packages/core/src/services-status/memory-probe.ts:18.
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: olam-memory-service
+  namespace: olam
+  labels:
+    app: olam-memory-service
+    olam.io/component: peripheral
+spec:
+  replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  selector:
+    matchLabels:
+      app: olam-memory-service
+  template:
+    metadata:
+      labels:
+        app: olam-memory-service
+    spec:
+      serviceAccountName: olam-memory-service
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 1000
+        runAsGroup: 1000
+        fsGroup: 1000
+      initContainers:
+        - name: chown-data
+          # busybox:1.36 — sha256-pinned per T4 threat model.
+          image: busybox@sha256:73aaf090f3d85aa34ee199857f03fa3a95c8ede2ffd4cc2cdb5b94e566b11662
+          imagePullPolicy: IfNotPresent
+          securityContext:
+            runAsUser: 0
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+          command: ["chown", "-R", "1000:1000", "/data"]
+          volumeMounts:
+            - name: memory-data
+              mountPath: /data
+      containers:
+        - name: olam-memory-service
+          image: ghcr.io/pleri/olam-memory-service@sha256:d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5
+          imagePullPolicy: IfNotPresent
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 1000
+            readOnlyRootFilesystem: true
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+          ports:
+            - name: http
+              containerPort: 3111
+              protocol: TCP
+          envFrom:
+            - configMapRef:
+                name: olam-memory-service-env
+            - secretRef:
+                name: olam-memory-service-secret
+          volumeMounts:
+            - name: memory-data
+              mountPath: /data
+            - name: tmp
+              mountPath: /tmp
+          readinessProbe:
+            httpGet:
+              # D15 (LOAD-BEARING): memory-service health path is /agentmemory/livez.
+              # Source: DEFAULT_HEALTH_PATH in packages/core/src/services-status/memory-probe.ts:18.
+              # Do NOT change to /health — that endpoint does not exist on this service.
+              path: /agentmemory/livez
+              port: 3111
+            initialDelaySeconds: 5
+            periodSeconds: 5
+            timeoutSeconds: 3
+            failureThreshold: 6
+          livenessProbe:
+            httpGet:
+              # D15 (LOAD-BEARING): same path as readinessProbe.
+              path: /agentmemory/livez
+              port: 3111
+            initialDelaySeconds: 30
+            periodSeconds: 20
+            timeoutSeconds: 5
+            failureThreshold: 3
+          resources:
+            requests:
+              cpu: "50m"
+              memory: "256Mi"
+            limits:
+              cpu: "500m"
+              memory: "1Gi"
+      volumes:
+        - name: memory-data
+          persistentVolumeClaim:
+            claimName: olam-memory-data
+        - name: tmp
+          emptyDir: {}

package/host-cp/k8s/manifests/memory-service/60-service.yaml

@@ -0,0 +1,21 @@
+# ClusterIP Service for olam-memory-service.
+# Port 3111 — consumed by host-cp and agents via cluster-internal DNS.
+# Operator surfaces externally via:
+#   kubectl port-forward -n olam svc/olam-memory-service 3111:3111
+apiVersion: v1
+kind: Service
+metadata:
+  name: olam-memory-service
+  namespace: olam
+  labels:
+    app: olam-memory-service
+    olam.io/component: peripheral
+spec:
+  type: ClusterIP
+  selector:
+    app: olam-memory-service
+  ports:
+    - name: http
+      port: 3111
+      targetPort: 3111
+      protocol: TCP

package/host-cp/k8s/templates/auth-service-secret-template.yaml

@@ -0,0 +1,28 @@
+# Secret TEMPLATE for olam-auth-service.
+#
+# This file is a TEMPLATE — it MUST NOT be applied directly without substituting
+# the placeholder values. The placeholders are intentionally invalid; a raw
+# `kubectl apply` will result in auth failures rather than silently shipping
+# fake credentials.
+#
+# Preferred substitution (keeps secrets out of git):
+#   kubectl create secret generic olam-auth-service-secret -n olam \
+#     --from-literal=OLAM_AUTH_DB_SECRET=$(cat ~/.olam/auth-db-secret) \
+#     --dry-run=client -o yaml | kubectl apply -f -
+#
+# This template lives in packages/host-cp/k8s/templates/ (NOT manifests/)
+# so that `kubectl apply -f manifests/auth-service/` does NOT apply it —
+# operators must explicitly handle Secret provisioning before applying manifests.
+apiVersion: v1
+kind: Secret
+metadata:
+  name: olam-auth-service-secret
+  namespace: olam
+  labels:
+    app: olam-auth-service
+    olam.io/component: peripheral
+type: Opaque
+stringData:
+  # Shared database encryption secret for the credential vault.
+  # Source: cat ~/.olam/auth-db-secret
+  OLAM_AUTH_DB_SECRET: "REPLACE_ME_FROM_HOME_DOTOLAM_AUTH_DB_SECRET"

package/host-cp/k8s/templates/kg-service-secret-template.yaml

@@ -0,0 +1,28 @@
+# Secret TEMPLATE for olam-kg-service.
+#
+# This file is a TEMPLATE — it MUST NOT be applied directly without substituting
+# the placeholder values. The placeholders are intentionally invalid; a raw
+# `kubectl apply` will result in auth failures rather than silently shipping
+# fake credentials.
+#
+# Preferred substitution (keeps secrets out of git):
+#   kubectl create secret generic olam-kg-service-secret -n olam \
+#     --from-literal=OLAM_KG_BEARER_TOKEN=$(cat ~/.olam/kg-bearer-token) \
+#     --dry-run=client -o yaml | kubectl apply -f -
+#
+# This template lives in packages/host-cp/k8s/templates/ (NOT manifests/)
+# so that `kubectl apply -f manifests/kg-service/` does NOT apply it —
+# operators must explicitly handle Secret provisioning before applying manifests.
+apiVersion: v1
+kind: Secret
+metadata:
+  name: olam-kg-service-secret
+  namespace: olam
+  labels:
+    app: olam-kg-service
+    olam.io/component: peripheral
+type: Opaque
+stringData:
+  # Bearer token for in-cluster KG query authentication.
+  # Source: cat ~/.olam/kg-bearer-token
+  OLAM_KG_BEARER_TOKEN: "REPLACE_ME_FROM_HOME_DOTOLAM_KG_BEARER_TOKEN"

package/host-cp/k8s/templates/mcp-auth-service-secret-template.yaml

@@ -0,0 +1,28 @@
+# Secret TEMPLATE for olam-mcp-auth-service.
+#
+# This file is a TEMPLATE — it MUST NOT be applied directly without substituting
+# the placeholder values. The placeholders are intentionally invalid; a raw
+# `kubectl apply` will result in auth failures rather than silently shipping
+# fake credentials.
+#
+# Preferred substitution (keeps secrets out of git):
+#   kubectl create secret generic olam-mcp-auth-service-secret -n olam \
+#     --from-literal=OLAM_MCP_AUTH_JWT_SECRET=$(cat ~/.olam/mcp-auth-jwt-secret) \
+#     --dry-run=client -o yaml | kubectl apply -f -
+#
+# This template lives in packages/host-cp/k8s/templates/ (NOT manifests/)
+# so that `kubectl apply -f manifests/mcp-auth-service/` does NOT apply it —
+# operators must explicitly handle Secret provisioning before applying manifests.
+apiVersion: v1
+kind: Secret
+metadata:
+  name: olam-mcp-auth-service-secret
+  namespace: olam
+  labels:
+    app: olam-mcp-auth-service
+    olam.io/component: peripheral
+type: Opaque
+stringData:
+  # JWT signing secret for MCP client authentication.
+  # Source: cat ~/.olam/mcp-auth-jwt-secret
+  OLAM_MCP_AUTH_JWT_SECRET: "REPLACE_ME_FROM_HOME_DOTOLAM_MCP_AUTH_JWT_SECRET"

package/host-cp/k8s/templates/memory-service-secret-template.yaml

@@ -0,0 +1,29 @@
+# Secret TEMPLATE for olam-memory-service.
+#
+# This file is a TEMPLATE — it MUST NOT be applied directly without substituting
+# the placeholder values. The placeholders are intentionally invalid; a raw
+# `kubectl apply` will result in auth failures rather than silently shipping
+# fake credentials.
+#
+# Preferred substitution (keeps secrets out of git):
+#   kubectl create secret generic olam-memory-service-secret -n olam \
+#     --from-literal=OLAM_MEMORY_BEARER_SECRET=$(cat ~/.olam/memory-bearer-secret) \
+#     --dry-run=client -o yaml | kubectl apply -f -
+#
+# This template lives in packages/host-cp/k8s/templates/ (NOT manifests/)
+# so that `kubectl apply -f manifests/memory-service/` does NOT apply it —
+# operators must explicitly handle Secret provisioning before applying manifests.
+apiVersion: v1
+kind: Secret
+metadata:
+  name: olam-memory-service-secret
+  namespace: olam
+  labels:
+    app: olam-memory-service
+    olam.io/component: peripheral
+type: Opaque
+stringData:
+  # Bearer secret for the memory-service HTTP API (matches OLAM_MEMORY_BEARER_SECRET
+  # used by host-cp and agents that call the memory endpoints).
+  # Source: cat ~/.olam/memory-bearer-secret
+  OLAM_MEMORY_BEARER_SECRET: "REPLACE_ME_FROM_HOME_DOTOLAM_MEMORY_BEARER_SECRET"

package/host-cp/src/plan-chat-service.mjs

@@ -22,7 +22,9 @@
 // Configuration is environment-driven so a single binary works in laptop
 // (the K3 container-spike), in a devbox container, and on a host-cp Mac:
 //
-//   OLAM_PLAN_CHAT_PORT          (default 3112)
+//   OLAM_PLAN_CHAT_PORT          (default 3200; moved off 3112 — see
+//                                 olam-chunks-subscriber-long-poll Phase A.
+//                                 agentmemory iii/node claim 3111-3113.)
 //   OLAM_PLAN_CHAT_DATABASE_URL  (default postgres://postgres:spike@localhost:54321/chunks)
 //   OLAM_PLAN_CHAT_ELECTRIC_URL  (default http://localhost:30001)
 //   OLAM_PLAN_CHAT_SECRET_PATH   (default ~/.olam/plan-chat-secret)
@@ -33,7 +35,7 @@ import { URL } from 'node:url';
 import pg from 'pg';
 import { ensureSecret, timingSafeEqual, SECRET_PATH } from './plan-chat-secret.mjs';
 
-const DEFAULT_PORT = 3112;
+const DEFAULT_PORT = 3200;
 const DEFAULT_DB_URL = 'postgres://postgres:spike@localhost:54321/chunks';
 const DEFAULT_ELECTRIC_URL = 'http://localhost:30001';
 
@@ -374,7 +376,24 @@ export async function startService(opts = {}) {
   });
 
   await new Promise((resolve, reject) => {
-    server.once('error', reject);
+    server.once('error', (err) => {
+      if (err && err.code === 'EADDRINUSE') {
+        // A3 — port-collision diagnostic. Prevents silent half-start when the
+        // target port is held by another process. agentmemory's `iii` has
+        // historically claimed 3111-3113 (motivated the 3112 → 3200 move in
+        // olam-chunks-subscriber-long-poll Phase A); flag it so the next
+        // collision is debuggable in one log line, not three rounds of grep.
+        // eslint-disable-next-line no-console
+        console.error(`[plan-chat-service] EADDRINUSE on :${port} — port already in use.`);
+        // eslint-disable-next-line no-console
+        console.error(`[plan-chat-service]   Check:  lsof -i:${port}`);
+        // eslint-disable-next-line no-console
+        console.error(`[plan-chat-service]   Note:   agentmemory's iii claims 3111-3113 (motivated 3112 → 3200 move).`);
+        // eslint-disable-next-line no-console
+        console.error(`[plan-chat-service]   Override: OLAM_PLAN_CHAT_PORT=<free-port>`);
+      }
+      reject(err);
+    });
     server.listen(port, () => resolve(undefined));
   });
 

package/host-cp/src/server.mjs

@@ -1921,7 +1921,7 @@ const server = http.createServer(async (req, res) => {
     // the host-cp service name. Default: host.docker.internal for the
     // operator-local demo flow.
     const hostCpUrlForContainer =
-      process.env.OLAM_AGENT_RUNTIME_HOST_CP_URL ?? 'http://host.docker.internal:3112';
+      process.env.OLAM_AGENT_RUNTIME_HOST_CP_URL ?? 'http://host.docker.internal:3200';
     try {
       const result = await triggerAgentRuntime({
         worldId: body.worldId,
@@ -1940,7 +1940,7 @@ const server = http.createServer(async (req, res) => {
   }
 
   // /api/plan-chat/* — passthrough proxy to plan-chat-service.
-  // The sidecar runs on PLAN_CHAT_SERVICE_URL (default http://127.0.0.1:3112).
+  // The sidecar runs on PLAN_CHAT_SERVICE_URL (default http://127.0.0.1:3200).
   // Strips the /api/plan-chat prefix; forwards method, headers, body, and
   // query verbatim. Streams the response (Electric SQL long-poll friendly).
   // Auth: client supplies Bearer; we don't add or strip it.
@@ -1950,8 +1950,8 @@ const server = http.createServer(async (req, res) => {
       // Default depends on where host-cp runs. In-container = host.docker.internal;
       // bare-node = 127.0.0.1. DOCKER_HOST=tcp://* implies container mode.
       ((process.env.DOCKER_HOST ?? '').startsWith('tcp://')
-        ? 'http://host.docker.internal:3112'
-        : 'http://127.0.0.1:3112');
+        ? 'http://host.docker.internal:3200'
+        : 'http://127.0.0.1:3200');
     const subPath = url.pathname === '/api/plan-chat'
       ? '/'
       : url.pathname.slice('/api/plan-chat'.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pleri/olam-cli",
-  "version": "0.1.146",
+  "version": "0.1.148",
   "type": "module",
   "bin": {
     "olam": "./bin/olam.cjs"