merge main into plano-session_pinning

config/envoy.template.yaml

@@ -594,13 +594,13 @@ static_resources:
 
   clusters:
 
-    - name: arch
+    - name: plano
       connect_timeout: {{ upstream_connect_timeout | default('5s') }}
       type: LOGICAL_DNS
       dns_lookup_family: V4_ONLY
       lb_policy: ROUND_ROBIN
       load_assignment:
-        cluster_name: arch
+        cluster_name: plano
         endpoints:
           - lb_endpoints:
               - endpoint:

config/plano_config_schema.yaml

@@ -85,7 +85,7 @@ properties:
                     type: string
                   default:
                     type: boolean
-                  filter_chain:
+                  input_filters:
                     type: array
                     items:
                       type: string
@@ -93,6 +93,14 @@ properties:
                 required:
                   - id
                   - description
+            input_filters:
+              type: array
+              items:
+                type: string
+            output_filters:
+              type: array
+              items:
+                type: string
           additionalProperties: false
           required:
             - type
@@ -173,7 +181,7 @@ properties:
         provider_interface:
           type: string
           enum:
-            - arch
+            - plano
             - claude
             - deepseek
             - groq
@@ -220,7 +228,7 @@ properties:
         provider_interface:
           type: string
           enum:
-            - arch
+            - plano
             - claude
             - deepseek
             - groq
@@ -271,6 +279,12 @@ properties:
       upstream_tls_ca_path:
         type: string
         description: "Path to the trusted CA bundle for upstream TLS verification. Default is '/etc/ssl/certs/ca-certificates.crt'."
+      llm_routing_model:
+        type: string
+        description: "Model name for the LLM router (e.g., 'Arch-Router'). Must match a model in model_providers."
+      agent_orchestration_model:
+        type: string
+        description: "Model name for the agent orchestrator (e.g., 'Plano-Orchestrator'). Must match a model in model_providers."
   system_prompt:
     type: string
   prompt_targets:

config/supervisord.conf

@@ -1,14 +1,33 @@
 [supervisord]
 nodaemon=true
+pidfile=/var/run/supervisord.pid
+
+[program:config_generator]
+command=/bin/sh -c "\
+    uv run python -m planoai.config_generator && \
+    envsubst < /app/plano_config_rendered.yaml > /app/plano_config_rendered.env_sub.yaml && \
+    envsubst < /etc/envoy/envoy.yaml > /etc/envoy.env_sub.yaml && \
+    touch /tmp/config_ready || \
+    (echo 'Config generation failed, shutting down'; kill -15 $(cat /var/run/supervisord.pid))"
+priority=10
+autorestart=false
+startsecs=0
+stdout_logfile=/dev/stdout
+redirect_stderr=true
+stdout_logfile_maxbytes=0
+stderr_logfile_maxbytes=0
 
 [program:brightstaff]
 command=sh -c "\
-    envsubst < /app/plano_config_rendered.yaml > /app/plano_config_rendered.env_sub.yaml && \
+    while [ ! -f /tmp/config_ready ]; do echo '[brightstaff] Waiting for config generation...'; sleep 0.5; done && \
     RUST_LOG=${LOG_LEVEL:-info} \
     PLANO_CONFIG_PATH_RENDERED=/app/plano_config_rendered.env_sub.yaml \
     /app/brightstaff 2>&1 | \
     tee /var/log/brightstaff.log | \
-    while IFS= read -r line; do echo '[brightstaff]' \"$line\"; done"
+    while IFS= read -r line; do echo '[brightstaff]' \"$line\"; done; \
+    echo '[brightstaff] Process exited, shutting down'; kill -15 $(cat /var/run/supervisord.pid)"
+priority=20
+autorestart=false
 stdout_logfile=/dev/stdout
 redirect_stderr=true
 stdout_logfile_maxbytes=0
@@ -16,13 +35,15 @@ stderr_logfile_maxbytes=0
 
 [program:envoy]
 command=/bin/sh -c "\
-    uv run python -m planoai.config_generator && \
-    envsubst < /etc/envoy/envoy.yaml > /etc/envoy.env_sub.yaml && \
-        envoy -c /etc/envoy.env_sub.yaml \
-            --component-log-level wasm:${LOG_LEVEL:-info} \
-          --log-format '[%%Y-%%m-%%d %%T.%%e][%%l] %%v' 2>&1 | \
+    while [ ! -f /tmp/config_ready ]; do echo '[plano_logs] Waiting for config generation...'; sleep 0.5; done && \
+    envoy -c /etc/envoy.env_sub.yaml \
+        --component-log-level wasm:${LOG_LEVEL:-info} \
+      --log-format '[%%Y-%%m-%%d %%T.%%e][%%l] %%v' 2>&1 | \
     tee /var/log/envoy.log | \
-    while IFS= read -r line; do echo '[plano_logs]' \"$line\"; done"
+    while IFS= read -r line; do echo '[plano_logs]' \"$line\"; done; \
+    echo '[plano_logs] Process exited, shutting down'; kill -15 $(cat /var/run/supervisord.pid)"
+priority=20
+autorestart=false
 stdout_logfile=/dev/stdout
 redirect_stderr=true
 stdout_logfile_maxbytes=0