aisnitch 0.2.3 → 0.2.5

package/dist/cli/index.cjs

@@ -3253,8 +3253,16 @@ var EventBus = class {
       },
       "Published event"
     );
-    this.emitter.emit("event", parsedEvent.data);
-    this.emitter.emit(`event:${parsedEvent.data.type}`, parsedEvent.data);
+    try {
+      this.emitter.emit("event", parsedEvent.data);
+    } catch (error) {
+      logger.warn({ error, eventType: parsedEvent.data.type }, "\u{1F4D6} Error in EventBus global subscriber");
+    }
+    try {
+      this.emitter.emit(`event:${parsedEvent.data.type}`, parsedEvent.data);
+    } catch (error) {
+      logger.warn({ error, eventType: parsedEvent.data.type }, "\u{1F4D6} Error in EventBus typed subscriber");
+    }
     return true;
   }
   /**
@@ -3520,6 +3528,7 @@ var WSServer = class {
     });
     socket.on("error", (error) => {
       logger.warn({ error }, "WebSocket consumer error");
+      this.consumers.delete(socket);
     });
     const welcomeMessage = {
       type: "welcome",
@@ -3674,10 +3683,17 @@ var HTTPReceiver = class {
   }
   async handleRequest(request, response, options) {
     this.requestCount += 1;
-    const requestUrl = new URL(
-      request.url ?? "/",
-      `http://${this.host}:${this.port ?? options.port}`
-    );
+    let requestUrl;
+    try {
+      requestUrl = new URL(
+        request.url ?? "/",
+        `http://${this.host}:${this.port ?? options.port}`
+      );
+    } catch {
+      this.invalidRequestCount += 1;
+      this.sendJson(response, 400, { error: "malformed request url" });
+      return;
+    }
     if (request.method === "GET" && requestUrl.pathname === "/health") {
       this.sendJson(response, 200, options.getHealthSnapshot());
       return;
@@ -4018,15 +4034,24 @@ var BaseAdapter = class {
         cwd: data.cwd ?? context.cwd
       }
     });
-    const published = await this.publishEventImplementation(event, {
-      cwd: context.cwd,
-      env: context.env,
-      hookPayload: context.hookPayload,
-      pid: context.pid,
-      sessionId,
-      source: context.source,
-      transcriptPath: context.transcriptPath
-    });
+    let published;
+    try {
+      published = await this.publishEventImplementation(event, {
+        cwd: context.cwd,
+        env: context.env,
+        hookPayload: context.hookPayload,
+        pid: context.pid,
+        sessionId,
+        source: context.source,
+        transcriptPath: context.transcriptPath
+      });
+    } catch (error) {
+      logger.error(
+        { error, eventType: type, adapter: this.name, sessionId },
+        "\u{1F4D6} Failed to publish event \u2014 swallowing to prevent daemon crash"
+      );
+      published = false;
+    }
     if (published) {
       this.eventsEmitted += 1;
     }
@@ -5012,6 +5037,9 @@ var ClaudeCodeAdapter = class extends BaseAdapter {
     });
     const context = {
       cwd: getString(payload, "cwd"),
+      // 📖 Pass process.env so the context detector can detect the terminal
+      // from TERM_PROGRAM, ITERM_SESSION_ID, etc. — hooks don't carry env vars
+      env: this.env ?? process.env,
       hookPayload: payload,
       pid: getNumber(payload, "pid"),
       sessionId,
@@ -5245,6 +5273,8 @@ function extractClaudeTranscriptObservations(payload, transcriptPath) {
   const tokensUsed = extractTokenUsage(payload);
   const rawPayload = payload;
   const sharedContext = {
+    // 📖 Pass process.env so terminal detection works from transcript path too
+    env: process.env,
     hookPayload: rawPayload,
     sessionId,
     source: "aisnitch://adapters/claude-code/transcript",
@@ -8901,6 +8931,8 @@ var OpenCodeAdapter = class extends BaseAdapter {
     });
     const context = {
       cwd: extractOpenCodeCwd(payload),
+      // 📖 Pass process.env so the context detector can detect the terminal
+      env: this.env ?? process.env,
       hookPayload: payload,
       pid: getNumber5(payload, "pid"),
       sessionId,
@@ -8911,6 +8943,8 @@ var OpenCodeAdapter = class extends BaseAdapter {
       cwd: context.cwd,
       errorMessage: extractOpenCodeErrorMessage(payload),
       errorType: extractOpenCodeErrorType(payload),
+      // 📖 Extract model from payload — OpenCode may send it as "model" or nested in properties
+      model: getString7(payload, "model") ?? getString7(getRecord6(payload.properties), "model"),
       project: extractOpenCodeProject(payload),
       raw: payload,
       toolInput: extractOpenCodeToolInput(payload),
@@ -9154,22 +9188,40 @@ var AdapterRegistry = class {
   }
   /**
    * Starts every adapter enabled in the current AISnitch config.
+   * 📖 Each adapter is started independently — one failure does not prevent
+   * the others from starting.
    */
   async startAll(config) {
     for (const adapter of this.list()) {
       if (config.adapters[adapter.name]?.enabled !== true) {
         continue;
       }
-      await adapter.start();
+      try {
+        await adapter.start();
+      } catch (error) {
+        logger.error(
+          { error, adapter: adapter.name },
+          `\u{1F4D6} Failed to start adapter "${adapter.name}" \u2014 skipping`
+        );
+      }
     }
   }
   /**
    * Stops every adapter in reverse registration order.
+   * 📖 Each adapter is stopped independently — one failure does not prevent
+   * the others from being stopped.
    */
   async stopAll() {
     const adapters = this.list().reverse();
     for (const adapter of adapters) {
-      await adapter.stop();
+      try {
+        await adapter.stop();
+      } catch (error) {
+        logger.warn(
+          { error, adapter: adapter.name },
+          `\u{1F4D6} Error stopping adapter "${adapter.name}" \u2014 continuing`
+        );
+      }
     }
   }
 };
@@ -9274,26 +9326,32 @@ var Pipeline = class {
         await adapter.handleHook(payload);
       });
     }
+    try {
+      this.wsPort = await this.wsServer.start({
+        port: resolvedWsPort,
+        eventBus: this.eventBus,
+        activeTools
+      });
+      this.httpPort = await this.httpReceiver.start({
+        port: resolvedHttpPort,
+        onHook: async (tool, payload) => {
+          await this.handleHook(tool, payload);
+        },
+        getHealthSnapshot: () => this.getHealthSnapshot()
+      });
+      this.socketPath = await this.udsServer.start({
+        socketPath,
+        onEvent: async (event) => {
+          await this.publishEvent(event);
+        }
+      });
+      await this.adapterRegistry.startAll(config);
+    } catch (error) {
+      logger.error({ error }, "\u{1F4D6} Pipeline start failed \u2014 rolling back already-started components");
+      await this.rollbackPartialStart();
+      throw error;
+    }
     this.startedAt = Date.now();
-    this.wsPort = await this.wsServer.start({
-      port: resolvedWsPort,
-      eventBus: this.eventBus,
-      activeTools
-    });
-    this.httpPort = await this.httpReceiver.start({
-      port: resolvedHttpPort,
-      onHook: async (tool, payload) => {
-        await this.handleHook(tool, payload);
-      },
-      getHealthSnapshot: () => this.getHealthSnapshot()
-    });
-    this.socketPath = await this.udsServer.start({
-      socketPath,
-      onEvent: async (event) => {
-        await this.publishEvent(event);
-      }
-    });
-    await this.adapterRegistry.startAll(config);
     logger.info(this.getStatus(), "Core pipeline started");
     return this.getStatus();
   }
@@ -9301,10 +9359,25 @@ var Pipeline = class {
    * Stops every pipeline component in reverse dependency order.
    */
   async stop() {
-    await this.adapterRegistry?.stopAll();
-    await this.httpReceiver.stop();
-    await this.udsServer.stop();
-    await this.wsServer.stop();
+    const stopSafely = async (label, fn) => {
+      try {
+        await fn();
+      } catch (error) {
+        logger.warn({ error }, `\u{1F4D6} Error while stopping ${label} \u2014 continuing shutdown`);
+      }
+    };
+    await stopSafely("adapter registry", async () => {
+      await this.adapterRegistry?.stopAll();
+    });
+    await stopSafely("HTTP receiver", async () => {
+      await this.httpReceiver.stop();
+    });
+    await stopSafely("UDS server", async () => {
+      await this.udsServer.stop();
+    });
+    await stopSafely("WebSocket server", async () => {
+      await this.wsServer.stop();
+    });
     this.eventBus.unsubscribeAll();
     this.adapterRegistry = null;
     this.enabledTools.clear();
@@ -9321,11 +9394,50 @@ var Pipeline = class {
   registerHookHandler(tool, handler) {
     this.hookHandlers.set(tool, handler);
   }
+  /**
+   * 📖 Rolls back any components that were successfully started before a
+   * failure occurred, preventing orphaned servers or leaking resources.
+   */
+  async rollbackPartialStart() {
+    const stopSafe = async (label, fn) => {
+      try {
+        await fn();
+      } catch (error) {
+        logger.warn({ error }, `\u{1F4D6} Error rolling back ${label}`);
+      }
+    };
+    await stopSafe("adapter registry", async () => {
+      await this.adapterRegistry?.stopAll();
+    });
+    await stopSafe("UDS server", async () => {
+      await this.udsServer.stop();
+    });
+    await stopSafe("HTTP receiver", async () => {
+      await this.httpReceiver.stop();
+    });
+    await stopSafe("WebSocket server", async () => {
+      await this.wsServer.stop();
+    });
+    this.adapterRegistry = null;
+    this.enabledTools.clear();
+    this.hookHandlers.clear();
+  }
   /**
    * Publishes an event after best-effort context enrichment.
+   * 📖 If enrichment fails, the original event is published un-enriched
+   * rather than being dropped entirely.
    */
   async publishEvent(event, context = {}) {
-    const enrichedEvent = await this.contextDetector.enrich(event, context);
+    let enrichedEvent;
+    try {
+      enrichedEvent = await this.contextDetector.enrich(event, context);
+    } catch (error) {
+      logger.warn(
+        { error, eventId: event.id },
+        "\u{1F4D6} Context enrichment failed \u2014 publishing un-enriched event"
+      );
+      enrichedEvent = event;
+    }
     return this.eventBus.publish(enrichedEvent);
   }
   /**
@@ -9361,6 +9473,16 @@ var Pipeline = class {
     };
   }
   async handleHook(tool, payload) {
+    try {
+      await this.handleHookInner(tool, payload);
+    } catch (error) {
+      logger.error(
+        { error, tool },
+        "\u{1F4D6} Unhandled error in hook handler \u2014 swallowing to prevent daemon crash"
+      );
+    }
+  }
+  async handleHookInner(tool, payload) {
     if (!this.enabledTools.has(tool)) {
       logger.debug({ tool }, "Ignoring hook for disabled tool");
       return;
@@ -10536,18 +10658,22 @@ function parseSocketPayload(data) {
   return parsedEvent.success ? parsedEvent.data : null;
 }
 function parseUnknownPayload(data) {
-  if (typeof data === "string") {
-    return JSON.parse(data);
-  }
-  if (Array.isArray(data)) {
-    return JSON.parse(Buffer.concat(data).toString("utf8"));
-  }
-  if (data instanceof ArrayBuffer) {
-    return JSON.parse(
-      Buffer.from(new Uint8Array(data)).toString("utf8")
-    );
+  try {
+    if (typeof data === "string") {
+      return JSON.parse(data);
+    }
+    if (Array.isArray(data)) {
+      return JSON.parse(Buffer.concat(data).toString("utf8"));
+    }
+    if (data instanceof ArrayBuffer) {
+      return JSON.parse(
+        Buffer.from(new Uint8Array(data)).toString("utf8")
+      );
+    }
+    return JSON.parse(Buffer.from(data).toString("utf8"));
+  } catch {
+    return null;
   }
-  return JSON.parse(Buffer.from(data).toString("utf8"));
 }
 
 // src/tui/hooks/useKeyBinds.ts
@@ -11275,16 +11401,20 @@ function ManagedDaemonApp({
 }
 function parseSocketPayload2(data) {
   let parsedPayload;
-  if (typeof data === "string") {
-    parsedPayload = JSON.parse(data);
-  } else if (Array.isArray(data)) {
-    parsedPayload = JSON.parse(Buffer.concat(data).toString("utf8"));
-  } else if (data instanceof ArrayBuffer) {
-    parsedPayload = JSON.parse(
-      Buffer.from(new Uint8Array(data)).toString("utf8")
-    );
-  } else {
-    parsedPayload = JSON.parse(Buffer.from(data).toString("utf8"));
+  try {
+    if (typeof data === "string") {
+      parsedPayload = JSON.parse(data);
+    } else if (Array.isArray(data)) {
+      parsedPayload = JSON.parse(Buffer.concat(data).toString("utf8"));
+    } else if (data instanceof ArrayBuffer) {
+      parsedPayload = JSON.parse(
+        Buffer.from(new Uint8Array(data)).toString("utf8")
+      );
+    } else {
+      parsedPayload = JSON.parse(Buffer.from(data).toString("utf8"));
+    }
+  } catch {
+    return null;
   }
   if (typeof parsedPayload === "object" && parsedPayload !== null && "type" in parsedPayload && parsedPayload.type === "welcome") {
     return null;
@@ -11931,16 +12061,20 @@ function hexToRgb(hexColor) {
   ];
 }
 function parseSocketMessage(data) {
-  if (typeof data === "string") {
-    return JSON.parse(data);
-  }
-  if (Array.isArray(data)) {
-    return JSON.parse(Buffer.concat(data).toString("utf8"));
-  }
-  if (data instanceof ArrayBuffer) {
-    return JSON.parse(Buffer.from(new Uint8Array(data)).toString("utf8"));
+  try {
+    if (typeof data === "string") {
+      return JSON.parse(data);
+    }
+    if (Array.isArray(data)) {
+      return JSON.parse(Buffer.concat(data).toString("utf8"));
+    }
+    if (data instanceof ArrayBuffer) {
+      return JSON.parse(Buffer.from(new Uint8Array(data)).toString("utf8"));
+    }
+    return JSON.parse(Buffer.from(data).toString("utf8"));
+  } catch {
+    return null;
   }
-  return JSON.parse(Buffer.from(data).toString("utf8"));
 }
 function isWelcomeMessage(payload) {
   if (!isRecord10(payload)) {
@@ -12288,6 +12422,20 @@ function createCliRuntime(dependencies = {}) {
     process.once("SIGINT", () => {
       void shutdown("SIGINT");
     });
+    process.once("uncaughtException", (error) => {
+      output.stderr(
+        `AISnitch crashed: ${error instanceof Error ? error.message : "unknown exception"}
+`
+      );
+      void shutdown("uncaughtException", 1);
+    });
+    process.once("unhandledRejection", (reason) => {
+      output.stderr(
+        `AISnitch rejected a promise: ${reason instanceof Error ? reason.message : "unknown rejection"}
+`
+      );
+      void shutdown("unhandledRejection", 1);
+    });
     await renderForegroundTui({
       configuredAdapters: getEnabledAdapters(config),
       eventBus: pipeline.getEventBus(),