@openape/nest 2.3.5 → 2.4.0

package/dist/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { watch } from "fs";
+import { readFileSync as readFileSync4, watch } from "fs";
 import process4 from "process";
 
 // src/lib/registry.ts
@@ -57,33 +57,61 @@ function pm2AppName(agentName) {
 function ecosystemPath(agentName) {
   return join2(AGENTS_DIR, agentName, "ecosystem.config.js");
 }
-function ecosystemContents(apesBin, agentName) {
-  void apesBin;
-  const envForwards = [
-    "APE_CHAT_BRIDGE_MODEL",
-    "LITELLM_BASE_URL",
-    "LITELLM_API_KEY",
-    "APE_CHAT_BRIDGE_TOOLS",
-    "APE_CHAT_BRIDGE_MAX_STEPS",
-    "APE_CHAT_BRIDGE_SYSTEM_PROMPT",
-    // Chat backend selection (chat.openape.ai vs troop.openape.ai) —
-    // honoured by the bridge at startup. See ape-agent/src/bridge.ts.
-    "OPENAPE_BRIDGE_TARGET",
-    "APE_CHAT_ENDPOINT"
-  ];
-  const envLines = envForwards.filter((k) => process2.env[k] !== void 0).map((k) => `      ${k}: ${JSON.stringify(process2.env[k])},`).join("\n");
+var CHAT_ENV_FORWARDS = [
+  "APE_CHAT_BRIDGE_MODEL",
+  "LITELLM_BASE_URL",
+  "LITELLM_API_KEY",
+  "APE_CHAT_BRIDGE_TOOLS",
+  "APE_CHAT_BRIDGE_MAX_STEPS",
+  "APE_CHAT_BRIDGE_SYSTEM_PROMPT",
+  // Chat backend selection (chat.openape.ai vs troop.openape.ai) —
+  // honoured by the bridge at startup. See ape-agent/src/bridge.ts.
+  "OPENAPE_BRIDGE_TARGET",
+  "APE_CHAT_ENDPOINT",
+  // The bridge's actual troop endpoint (bridge.ts readConfig → endpoint).
+  // Unset in prod → defaults to https://troop.openape.ai; the local stack
+  // sets it to https://troop.openape.test so the bridge talks to the local
+  // control plane, not production.
+  "OPENAPE_TROOP_URL"
+];
+function ecosystemEnvLines(agent) {
+  let pairs;
+  if (agent.kind === "service") {
+    const br = agent.bridge ?? {};
+    const candidates = {
+      OPENAPE_SP_BASE_URL: agent.service?.spBaseUrl,
+      LITELLM_BASE_URL: br.baseUrl ?? process2.env.LITELLM_BASE_URL,
+      LITELLM_API_KEY: br.apiKey ?? process2.env.LITELLM_API_KEY ?? process2.env.LITELLM_MASTER_KEY,
+      APE_SERVICE_MODEL: br.model ?? process2.env.APE_SERVICE_MODEL ?? process2.env.APE_CHAT_BRIDGE_MODEL,
+      APE_SERVICE_POLL_MS: agent.service?.pollIntervalMs != null ? String(agent.service.pollIntervalMs) : void 0
+    };
+    pairs = Object.entries(candidates).filter((e) => e[1] !== void 0);
+  } else {
+    pairs = CHAT_ENV_FORWARDS.filter((k) => process2.env[k] !== void 0).map((k) => [k, process2.env[k]]);
+  }
+  if (process2.env.OPENAPE_BYPASS_APE_SHELL === "1")
+    pairs.push(["OPENAPE_BYPASS_APE_SHELL", "1"]);
+  if (process2.env.OPENAPE_RECIPE_DEV_DIR)
+    pairs.push(["OPENAPE_RECIPE_DEV_DIR", process2.env.OPENAPE_RECIPE_DEV_DIR]);
+  if (process2.env.NODE_EXTRA_CA_CERTS)
+    pairs.push(["NODE_EXTRA_CA_CERTS", process2.env.NODE_EXTRA_CA_CERTS]);
+  return pairs.map(([k, v]) => `      ${k}: ${JSON.stringify(v)},`).join("\n");
+}
+function ecosystemContents(agent) {
+  const script = agent.kind === "service" ? "ape-agent-service" : "ape-agent";
+  const envLines = ecosystemEnvLines(agent);
   const envBlock = envLines ? `
     env: {
 ${envLines}
     },
 ` : "";
-  return `// Auto-generated by Pm2Supervisor for agent '${agentName}'.
+  return `// Auto-generated by Pm2Supervisor for agent '${agent.name}'.
 // Edit at runtime via:
-//   apes run --as ${agentName} -- pm2 reload ${pm2AppName(agentName)}
+//   apes run --as ${agent.name} -- pm2 reload ${pm2AppName(agent.name)}
 module.exports = {
   apps: [{
-    name: '${pm2AppName(agentName)}',
-    script: 'ape-agent',
+    name: '${pm2AppName(agent.name)}',
+    script: '${script}',
     autorestart: true,
     max_restarts: 10,
     min_uptime: '30s',
@@ -123,11 +151,11 @@ var Pm2Supervisor = class {
   /** Bring per-agent pm2 state in line with the registry. Idempotent. */
   async reconcile(desired) {
     for (const agent of desired) {
-      if (agent.bridge == null) continue;
+      if (agent.kind !== "service" && agent.bridge == null) continue;
       if (this.inflight.has(agent.name)) continue;
       this.inflight.add(agent.name);
       try {
-        await this.startOrReload(agent.name);
+        await this.startOrReload(agent);
       } catch (err) {
         this.deps.log(`pm2-supervisor: ${agent.name} reconcile errored: ${err instanceof Error ? err.message.split("\n")[0] : String(err)}`);
       } finally {
@@ -152,12 +180,13 @@ var Pm2Supervisor = class {
    */
   async stopAll() {
   }
-  async startOrReload(agentName) {
+  async startOrReload(agent) {
+    const agentName = agent.name;
     ensureSharedDir(AGENTS_DIR);
     const dir = join2(AGENTS_DIR, agentName);
     ensureSharedDir(dir);
     const path = ecosystemPath(agentName);
-    writeFileSync2(path, ecosystemContents(this.deps.apesBin, agentName), { mode: 436 });
+    writeFileSync2(path, ecosystemContents(agent), { mode: 436 });
     const startPath = startScriptPath(agentName);
     writeFileSync2(startPath, startScriptContents(agentName), { mode: 509 });
     void path;
@@ -644,11 +673,22 @@ try {
   });
   log(`nest: watching ${REGISTRY_PATH} for registry changes`);
 } catch (err) {
-  log(`nest: registry watch failed (${err instanceof Error ? err.message : String(err)}) \u2014 falling back to 5s poll`);
+  log(`nest: registry watch failed (${err instanceof Error ? err.message : String(err)}) \u2014 falling back to 5s change-detecting poll`);
+  let lastSig = registrySignature();
   setInterval(() => {
+    const sig = registrySignature();
+    if (sig === lastSig) return;
+    lastSig = sig;
     void reconcile();
   }, 5e3).unref();
 }
+function registrySignature() {
+  try {
+    return readFileSync4(REGISTRY_PATH, "utf8");
+  } catch {
+    return "";
+  }
+}
 process4.on("SIGTERM", () => {
   log("nest: SIGTERM \u2014 stopping");
   troopSync.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openape/nest",
-  "version": "2.3.5",
+  "version": "2.4.0",
   "description": "OpenApe Nest — local control-plane daemon that supervises agent processes on this computer. Talks to troop SP for ownership state, spawns/destroys agents via DDISA always-grants, supervises chat-bridge children (replacing per-agent launchd plists).",
   "type": "module",
   "license": "MIT",