routstrd 0.4.0 → 0.4.1

package/src/start-daemon.ts

@@ -170,6 +170,22 @@ async function startDaemonUnlocked(
 
   proc.unref();
 
+  // The daemon must outlive a successful start, but a start we give up on must not
+  // leave a detached process holding the wallet locks. `detached` makes it a group leader.
+  const killSpawnedDaemon = (): void => {
+    try {
+      process.kill(-proc.pid, "SIGTERM");
+    } catch {
+      // Already exited.
+    }
+  };
+  const abandonOnSignal = (): void => {
+    killSpawnedDaemon();
+    process.exit(1);
+  };
+  process.once("SIGINT", abandonOnSignal);
+  process.once("SIGTERM", abandonOnSignal);
+
   let exitCode: number | null = null;
   proc.exited.then((code) => {
     exitCode = code;
@@ -212,6 +228,8 @@ async function startDaemonUnlocked(
     }
 
     if (await healthyDaemonHost(port, host)) {
+      process.off("SIGINT", abandonOnSignal);
+      process.off("SIGTERM", abandonOnSignal);
       printStartupProgress(progressLogOffset);
       console.log(
         `Routstr daemon started (PID: ${proc.pid}, ${formatElapsed(Date.now() - startedAt)}).`,
@@ -220,8 +238,10 @@ async function startDaemonUnlocked(
     }
   }
 
+  killSpawnedDaemon();
   throw new Error(
-    `Daemon failed to start within ${Math.round(startupTimeoutMs / 1000)} seconds. Check logs in ${LOGS_DIR}`,
+    `Daemon did not become healthy within ${Math.round(startupTimeoutMs / 1000)} seconds; ` +
+      `the incomplete daemon (PID ${proc.pid}) was stopped. Check logs in ${LOGS_DIR}`,
   );
 }
 

package/tests/integrations/hermes.test.ts

@@ -66,7 +66,7 @@ other_setting: true
     });
   });
 
-  it("keeps an existing Routstr provider unchanged without duplicating it", () => {
+  it("updates an existing Routstr provider in place without duplicating it", () => {
     const existing = `custom_providers:
   - name: Routstr (old-host:8008)
     base_url: http://old-host:8008/v1
@@ -83,14 +83,51 @@ other_setting: true
 
     expect(routstrProviders).toHaveLength(1);
     expect(routstrProviders[0]).toEqual({
-      name: "Routstr (old-host:8008)",
-      base_url: "http://old-host:8008/v1",
-      api_key: "old-key",
-      model: "old-model",
+      name: "Routstr (localhost:8008)",
+      base_url: ROUTSTR.baseUrl,
+      api_key: ROUTSTR.apiKey,
+      model: ROUTSTR.defaultModel,
     });
     expect(twice).toBe(once);
   });
 
+  it("repoints model.provider when the Routstr provider is renamed", () => {
+    const existing = `model:
+  default: old-model
+  provider: custom:routstr-(old-host:8008)
+
+custom_providers:
+  - name: Routstr (old-host:8008)
+    base_url: http://old-host:8008/v1
+    api_key: old-key
+    model: old-model
+`;
+
+    const merged = parse(mergeHermesConfig(existing, ROUTSTR));
+
+    expect(merged.model).toEqual({
+      default: "old-model",
+      provider: "custom:routstr-(localhost:8008)",
+    });
+  });
+
+  it("leaves model.provider alone when it does not reference the Routstr provider", () => {
+    const existing = `model:
+  default: user-model
+  provider: custom:user-provider
+
+custom_providers:
+  - name: Routstr (old-host:8008)
+    base_url: http://old-host:8008/v1
+    api_key: old-key
+    model: old-model
+`;
+
+    const merged = parse(mergeHermesConfig(existing, ROUTSTR));
+
+    expect(merged.model.provider).toBe("custom:user-provider");
+  });
+
   it("rejects malformed YAML instead of replacing it", () => {
     expect(() => mergeHermesConfig("model: [unterminated", ROUTSTR)).toThrow();
   });