aisnitch 0.2.19 → 0.2.21

package/dist/cli/index.js

@@ -8,7 +8,7 @@ import { Command, InvalidArgumentError } from "commander";
 
 // src/package-info.ts
 var AISNITCH_PACKAGE_NAME = "aisnitch";
-var AISNITCH_VERSION = "0.2.19";
+var AISNITCH_VERSION = "0.2.21";
 var AISNITCH_DESCRIPTION = "Universal bridge for AI coding tool activity \u2014 capture, normalize, stream.";
 
 // src/core/events/schema.ts
@@ -49,6 +49,8 @@ var TOOL_NAMES = [
   "kiro",
   "augment-code",
   "mistral",
+  "zed",
+  "pi",
   "unknown"
 ];
 var ERROR_TYPES = [
@@ -90,47 +92,58 @@ function createUuidV7() {
   return uuidv7();
 }
 var ToolInputSchema = z.strictObject({
-  filePath: z.string().min(1).optional(),
-  command: z.string().min(1).optional()
+  filePath: z.string().min(1).max(4096).optional(),
+  command: z.string().min(1).max(1e4).optional()
 }).refine(
   (value) => value.filePath !== void 0 || value.command !== void 0,
   "toolInput must include filePath or command"
 );
+var ThinkingContentSchema = z.string().max(1e5).describe("Raw thinking/reasoning content from the AI model");
+var ToolCallNameSchema = z.string().min(1).max(100).describe("Name of the tool being invoked (e.g., Edit, Bash, Grep)");
+var FinalMessageSchema = z.string().max(5e4).describe("End-of-run summary or completion message");
+var ToolResultSchema = z.string().max(1e4).describe("Tool execution result or output");
+var MessageContentSchema = z.string().max(1e5).describe("Raw text content from AI messages");
 var ToolNameSchema = z.enum(TOOL_NAMES);
 var AISnitchEventTypeSchema = z.enum(AISNITCH_EVENT_TYPES);
 var ErrorTypeSchema = z.enum(ERROR_TYPES);
 var CESPCategorySchema = z.enum(CESP_CATEGORIES);
 var EventDataSchema = z.strictObject({
   state: AISnitchEventTypeSchema,
-  project: z.string().min(1).optional(),
-  projectPath: z.string().min(1).optional(),
+  project: z.string().min(1).max(255).optional(),
+  projectPath: z.string().min(1).max(4096).optional(),
   duration: z.number().int().min(0).optional(),
-  toolName: z.string().min(1).optional(),
+  toolName: z.string().min(1).max(100).optional(),
   toolInput: ToolInputSchema.optional(),
-  activeFile: z.string().min(1).optional(),
-  model: z.string().min(1).optional(),
+  activeFile: z.string().min(1).max(4096).optional(),
+  model: z.string().min(1).max(200).optional(),
   tokensUsed: z.number().int().min(0).optional(),
-  errorMessage: z.string().min(1).optional(),
+  errorMessage: z.string().min(1).max(1e4).optional(),
   errorType: ErrorTypeSchema.optional(),
   raw: z.record(z.string(), z.unknown()).optional(),
-  terminal: z.string().min(1).optional(),
-  cwd: z.string().min(1).optional(),
+  terminal: z.string().min(1).max(100).optional(),
+  cwd: z.string().min(1).max(4096).optional(),
   pid: z.number().int().positive().optional(),
-  instanceId: z.string().min(1).optional(),
+  instanceId: z.string().min(1).max(255).optional(),
   instanceIndex: z.number().int().min(1).optional(),
-  instanceTotal: z.number().int().min(1).optional()
+  instanceTotal: z.number().int().min(1).optional(),
+  // New fields for enhanced content capture
+  thinkingContent: ThinkingContentSchema.optional(),
+  toolCallName: ToolCallNameSchema.optional(),
+  finalMessage: FinalMessageSchema.optional(),
+  toolResult: ToolResultSchema.optional(),
+  messageContent: MessageContentSchema.optional()
 });
 var AISnitchEventSchema = z.strictObject({
   specversion: z.literal("1.0"),
   id: z.string().refine(isUuidV7, "id must be a valid UUIDv7 string"),
-  source: z.string().refine(
+  source: z.string().max(2e3).refine(
     isValidUriReference,
     "source must be a valid non-empty CloudEvents URI-reference"
   ),
   type: AISnitchEventTypeSchema,
   time: ISO_TIMESTAMP_SCHEMA,
   "aisnitch.tool": ToolNameSchema,
-  "aisnitch.sessionid": z.string().min(1),
+  "aisnitch.sessionid": z.string().min(1).max(500),
   "aisnitch.seqnum": z.number().int().min(1),
   data: EventDataSchema
 });
@@ -2432,11 +2445,11 @@ function toConfigPathOptions(options) {
 // src/cli/runtime.ts
 import { execFile as execFileCallback14, spawn as spawnChildProcess2 } from "child_process";
 import { closeSync, openSync } from "fs";
-import { mkdtemp, readFile as readFile14, rename, rm as rm4, writeFile as writeFile5 } from "fs/promises";
+import { mkdtemp, readFile as readFile15, rename, rm as rm4, writeFile as writeFile5 } from "fs/promises";
 import { createConnection as createConnection3 } from "net";
 import { tmpdir } from "os";
-import { basename as basename11, join as join16 } from "path";
-import { promisify as promisify14 } from "util";
+import { basename as basename12, join as join18 } from "path";
+import { promisify as promisify15 } from "util";
 
 // src/adapters/generic-pty.ts
 import { basename as basename3 } from "path";
@@ -2507,9 +2520,11 @@ var TOOL_BINARY_MAP = {
   "openhands": "openhands",
   "openclaw": "openclaw",
   "opencode": "opencode",
+  "pi": "pi",
   "qwen-code": "qwen",
   "unknown": "unknown",
-  "windsurf": "windsurf"
+  "windsurf": "windsurf",
+  "zed": "zed"
 };
 var ContextDetector = class {
   cache = /* @__PURE__ */ new Map();
@@ -3318,6 +3333,346 @@ function isPidRunning(pid) {
   }
 }
 
+// src/core/errors.ts
+var AISnitchError = class _AISnitchError extends Error {
+  /**
+   * Machine-readable error code for programmatic handling.
+   * Format: `SUBCATEGORY_SPECIFIC_DETAIL` (uppercase with underscores).
+   */
+  code;
+  /**
+   * Arbitrary context bag forwarded to the logger for structured debugging.
+   */
+  context;
+  constructor(message, code, context) {
+    super(message);
+    this.name = "AISnitchError";
+    this.code = code;
+    this.context = context;
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, _AISnitchError);
+    }
+  }
+  /**
+   * Full error chain for logging: `[name] code — message`.
+   */
+  toString() {
+    return `${this.name} [${this.code}] \u2014 ${this.message}`;
+  }
+  /**
+   * JSON serialization friendly to pino serializers.
+   */
+  toJSON() {
+    return {
+      name: this.name,
+      code: this.code,
+      message: this.message,
+      context: this.context,
+      stack: this.stack
+    };
+  }
+};
+function isAISnitchError(error) {
+  return error instanceof AISnitchError;
+}
+function isRetryableError(error) {
+  if (!isAISnitchError(error)) {
+    if (error instanceof Error) {
+      const code = error.code;
+      const retryableCodes = /* @__PURE__ */ new Set([
+        "ECONNREFUSED",
+        "ECONNRESET",
+        "ETIMEDOUT",
+        "ENOTFOUND",
+        "EHOSTUNREACH",
+        "EPIPE",
+        "EPERM"
+        // sometimes transient on macOS file locks
+      ]);
+      if (typeof code === "string" && retryableCodes.has(code)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  const retryableCategories = /* @__PURE__ */ new Set(["TIMEOUT", "NETWORK"]);
+  for (const category of retryableCategories) {
+    if (error.code.startsWith(category)) {
+      return true;
+    }
+  }
+  const retryablePatterns = [
+    /^ADAPTER_.*_(FILE_IO|NETWORK|PROCESS_DETECT)_ERROR$/,
+    /^PIPELINE_.*_(RETRY|RECONNECT)_ERROR$/
+  ];
+  for (const pattern of retryablePatterns) {
+    if (pattern.test(error.code)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// src/core/circuit-breaker.ts
+var CircuitOpenError = class _CircuitOpenError extends AISnitchError {
+  constructor(circuitId, state) {
+    super(
+      `Circuit "${circuitId}" is OPEN \u2014 operation rejected`,
+      "CIRCUIT_OPEN",
+      { circuitId, failures: state.failures, lastFailureAt: state.lastFailureAt }
+    );
+    this.circuitId = circuitId;
+    this.state = state;
+    this.name = "CircuitOpenError";
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, _CircuitOpenError);
+    }
+  }
+  toString() {
+    return `${this.name} [${this.code}] "${this.circuitId}" \u2014 failures=${this.state.failures}`;
+  }
+};
+var DEFAULT_OPTIONS = {
+  failureThreshold: 5,
+  halfOpenAfterMs: 3e4,
+  id: "unnamed",
+  resetOnSuccess: true,
+  shouldCountAsFailure: isRetryableError,
+  windowMs: 6e4
+};
+var CircuitBreaker = class {
+  failures = 0;
+  lastFailureAt = null;
+  state = "closed";
+  halfOpenTestStartedAt = null;
+  options;
+  constructor(options = {}) {
+    this.options = {
+      ...DEFAULT_OPTIONS,
+      ...options,
+      // Re-spread to ensure all fields have defaults
+      failureThreshold: options.failureThreshold ?? DEFAULT_OPTIONS.failureThreshold,
+      halfOpenAfterMs: options.halfOpenAfterMs ?? DEFAULT_OPTIONS.halfOpenAfterMs,
+      id: options.id ?? DEFAULT_OPTIONS.id,
+      resetOnSuccess: options.resetOnSuccess ?? DEFAULT_OPTIONS.resetOnSuccess,
+      shouldCountAsFailure: options.shouldCountAsFailure ?? DEFAULT_OPTIONS.shouldCountAsFailure,
+      windowMs: options.windowMs ?? DEFAULT_OPTIONS.windowMs
+    };
+  }
+  /**
+   * Executes an async operation through the circuit breaker.
+   *
+   * - If the circuit is CLOSED → runs `fn` and updates state based on result
+   * - If the circuit is HALF-OPEN → runs `fn` once to test recovery
+   * - If the circuit is OPEN → throws `CircuitOpenError` immediately (no call)
+   *
+   * @param fn - The async operation to protect
+   * @returns The result of `fn` if successful
+   * @throws CircuitOpenError if the circuit is OPEN
+   * @throws The error from `fn` if it throws (and `shouldCountAsFailure` returns true)
+   */
+  async execute(fn) {
+    switch (this.state) {
+      case "closed":
+        return this.executeClosed(fn);
+      case "half-open":
+        return this.executeHalfOpen(fn);
+      case "open":
+        if (this.shouldTransitionToHalfOpen()) {
+          this.transitionToHalfOpen();
+          return this.executeHalfOpen(fn);
+        }
+        throw new CircuitOpenError(this.options.id, this.getState());
+    }
+  }
+  /**
+   * Returns the current observable circuit state.
+   */
+  getState() {
+    return {
+      failures: this.failures,
+      lastFailureAt: this.lastFailureAt,
+      state: this.state
+    };
+  }
+  /**
+   * Forces the circuit to CLOSED (resets failure count and state).
+   * Useful for manual recovery after a known-fix or after a maintenance window.
+   */
+  reset() {
+    this.failures = 0;
+    this.lastFailureAt = null;
+    this.state = "closed";
+    this.halfOpenTestStartedAt = null;
+    logger.debug({ circuitId: this.options.id }, "Circuit breaker manually reset");
+  }
+  /**
+   * Pre-warms the circuit by performing one test call in HALF-OPEN state.
+   * If the circuit is already HALF-OPEN, this does nothing.
+   * If the circuit is CLOSED, this does nothing.
+   */
+  async preWarm(fn) {
+    if (this.state !== "open") {
+      return;
+    }
+    this.transitionToHalfOpen();
+    try {
+      await fn();
+      this.transitionToClosed();
+    } catch {
+      this.transitionToOpen();
+    }
+  }
+  // ─────────────────────────────────────────────────────────────────────────
+  // Private methods
+  // ─────────────────────────────────────────────────────────────────────────
+  async executeClosed(fn) {
+    try {
+      const result = await fn();
+      this.onSuccess();
+      return result;
+    } catch (error) {
+      this.onFailure(error);
+      throw error;
+    }
+  }
+  async executeHalfOpen(fn) {
+    this.halfOpenTestStartedAt = Date.now();
+    try {
+      const result = await fn();
+      this.transitionToClosed();
+      return result;
+    } catch (error) {
+      this.transitionToOpen();
+      throw error;
+    }
+  }
+  onSuccess() {
+    if (this.options.resetOnSuccess) {
+      this.failures = 0;
+      this.lastFailureAt = null;
+    } else {
+      this.failures = Math.max(0, this.failures - 1);
+      if (this.failures === 0) {
+        this.lastFailureAt = null;
+      }
+    }
+    logger.debug(
+      {
+        circuitId: this.options.id,
+        failures: this.failures
+      },
+      "Circuit breaker operation succeeded"
+    );
+  }
+  onFailure(error) {
+    if (!this.options.shouldCountAsFailure(error)) {
+      logger.debug(
+        { circuitId: this.options.id, error },
+        "Circuit breaker operation failed but error is not counted as failure"
+      );
+      return;
+    }
+    this.failures += 1;
+    this.lastFailureAt = Date.now();
+    if (this.failures >= this.options.failureThreshold) {
+      this.transitionToOpen();
+    } else {
+      logger.debug(
+        {
+          circuitId: this.options.id,
+          failures: this.failures,
+          threshold: this.options.failureThreshold
+        },
+        "Circuit breaker recorded failure"
+      );
+    }
+  }
+  transitionToOpen() {
+    if (this.state === "open") {
+      return;
+    }
+    this.state = "open";
+    this.halfOpenTestStartedAt = null;
+    logger.warn(
+      {
+        circuitId: this.options.id,
+        failures: this.failures,
+        windowMs: this.options.windowMs
+      },
+      "\u{1F534} Circuit breaker OPEN \u2014 blocking operations"
+    );
+  }
+  transitionToHalfOpen() {
+    this.state = "half-open";
+    this.halfOpenTestStartedAt = Date.now();
+    logger.info(
+      { circuitId: this.options.id },
+      "\u{1F7E1} Circuit breaker HALF-OPEN \u2014 testing recovery"
+    );
+  }
+  transitionToClosed() {
+    this.state = "closed";
+    this.failures = 0;
+    this.lastFailureAt = null;
+    this.halfOpenTestStartedAt = null;
+    logger.info(
+      { circuitId: this.options.id },
+      "\u{1F7E2} Circuit breaker CLOSED \u2014 recovery successful"
+    );
+  }
+  shouldTransitionToHalfOpen() {
+    if (this.lastFailureAt === null) {
+      return true;
+    }
+    const elapsed = Date.now() - this.lastFailureAt;
+    return elapsed >= this.options.halfOpenAfterMs;
+  }
+};
+var SHARED_BREAKERS = Object.freeze({
+  /**
+   * Breaker for adapter event emission.
+   * Threshold: 5 failures in 60s → open for 30s → half-open test.
+   */
+  adapterEmit: new CircuitBreaker({
+    id: "adapter.emit",
+    failureThreshold: 5,
+    halfOpenAfterMs: 3e4,
+    shouldCountAsFailure: isRetryableError,
+    windowMs: 6e4
+  }),
+  /**
+   * Breaker for file system operations (transcript reading, config loading).
+   * More tolerant: 10 failures in 60s → open for 30s.
+   */
+  fileSystem: new CircuitBreaker({
+    id: "filesystem",
+    failureThreshold: 10,
+    halfOpenAfterMs: 3e4,
+    windowMs: 6e4
+  }),
+  /**
+   * Breaker for HTTP/HTTPS requests.
+   * Stricter: 3 failures in 30s → open for 15s.
+   */
+  httpRequest: new CircuitBreaker({
+    id: "http-request",
+    failureThreshold: 3,
+    halfOpenAfterMs: 15e3,
+    windowMs: 3e4
+  }),
+  /**
+   * Breaker for process detection operations.
+   * Most tolerant: 20 failures in 60s → open for 10s.
+   */
+  processDetection: new CircuitBreaker({
+    id: "process-detection",
+    failureThreshold: 20,
+    halfOpenAfterMs: 1e4,
+    windowMs: 6e4
+  })
+});
+
 // src/core/engine/event-bus.ts
 import { EventEmitter } from "eventemitter3";
 var EventBus = class {
@@ -4030,7 +4385,7 @@ var UDSServer = class {
 };
 
 // src/core/engine/pipeline.ts
-import { join as join13 } from "path";
+import { join as join15 } from "path";
 import { z as z4 } from "zod";
 
 // src/adapters/aider.ts
@@ -4137,20 +4492,29 @@ var BaseAdapter = class {
     });
     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
+      published = await SHARED_BREAKERS.adapterEmit.execute(async () => {
+        return 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"
-      );
+      if (error instanceof Error && error.name === "CircuitOpenError") {
+        logger.warn(
+          { error, eventType: type, adapter: this.name },
+          "\u{1F4D6} Adapter emit blocked by open circuit \u2014 event dropped"
+        );
+      } else {
+        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) {
@@ -5164,7 +5528,11 @@ var ClaudeCodeAdapter = class extends BaseAdapter {
         return;
       }
       case "SessionEnd": {
-        await this.emitStateChange("session.end", sharedData, context);
+        const finalMessage = extractFinalMessageFromPayload(payload);
+        await this.emitStateChange("session.end", {
+          ...sharedData,
+          finalMessage
+        }, context);
         return;
       }
       case "UserPromptSubmit":
@@ -5181,12 +5549,22 @@ var ClaudeCodeAdapter = class extends BaseAdapter {
         return;
       }
       case "PreToolUse": {
-        await this.emitStateChange("agent.tool_call", sharedData, context);
+        const toolCallName = extractToolNameFromPayload(payload);
+        await this.emitStateChange("agent.tool_call", {
+          ...sharedData,
+          toolCallName
+        }, context);
         return;
       }
       case "PostToolUse": {
+        const toolCallName = extractToolNameFromPayload(payload);
+        const toolResult = extractToolResultFromPayload(payload);
         const emittedType = isClaudeCodingTool(sharedData.toolName) ? "agent.coding" : "agent.tool_call";
-        await this.emitStateChange(emittedType, sharedData, context);
+        await this.emitStateChange(emittedType, {
+          ...sharedData,
+          toolCallName,
+          toolResult
+        }, context);
         return;
       }
       case "PostToolUseFailure":
@@ -5388,21 +5766,50 @@ function extractClaudeTranscriptObservations(payload, transcriptPath) {
   };
   const observations = [];
   if (contentParts.some((part) => part.type === "thinking")) {
+    const thinkingParts = contentParts.filter((part) => part.type === "thinking");
+    const thinkingText = thinkingParts.map((part) => {
+      const text = part.text;
+      return typeof text === "string" ? text : void 0;
+    }).filter((text) => text !== void 0).join("\n");
     observations.push({
       context: sharedContext,
-      data: sharedData,
+      data: {
+        ...sharedData,
+        thinkingContent: thinkingText.length > 0 ? thinkingText : void 0
+      },
       type: "agent.thinking"
     });
   }
   if (contentParts.some(
     (part) => part.type === "text" && typeof part.text === "string" && part.text.trim().length > 0
   )) {
+    const messageTexts = contentParts.filter((part) => part.type === "text").map((part) => part.text).filter((text) => text.trim().length > 0);
+    const messageContent = messageTexts.join("\n");
     observations.push({
       context: sharedContext,
-      data: sharedData,
+      data: {
+        ...sharedData,
+        messageContent: messageContent.length > 0 ? messageContent : void 0
+      },
       type: "agent.streaming"
     });
   }
+  const toolUseParts = contentParts.filter(
+    (part) => part.type === "tool_use" || part.type === "toolUse"
+  );
+  if (toolUseParts.length > 0) {
+    const toolName = getString(toolUseParts[0], "name") ?? getString(toolUseParts[0], "tool");
+    if (toolName) {
+      observations.push({
+        context: sharedContext,
+        data: {
+          ...sharedData,
+          toolCallName: toolName
+        },
+        type: "agent.tool_call"
+      });
+    }
+  }
   return observations;
 }
 function extractClaudeContentParts(payload) {
@@ -5525,6 +5932,51 @@ function getString(payload, key) {
   const value = payload[key];
   return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 }
+function extractToolNameFromPayload(payload) {
+  const directToolName = getString(payload, "tool_name") ?? getString(payload, "toolName");
+  if (directToolName) {
+    return directToolName;
+  }
+  const toolUse = getRecord(payload.tool_use) ?? getRecord(payload.toolUse);
+  if (toolUse) {
+    return getString(toolUse, "name") ?? getString(toolUse, "tool");
+  }
+  const toolInput = getRecord(payload.tool_input) ?? getRecord(payload.toolInput);
+  if (toolInput) {
+    return getString(toolInput, "tool_name") ?? getString(toolInput, "type");
+  }
+  return void 0;
+}
+function extractToolResultFromPayload(payload) {
+  const directResult = getString(payload, "result") ?? getString(payload, "output");
+  if (directResult) {
+    return directResult;
+  }
+  const toolResult = getRecord(payload.tool_result) ?? getRecord(payload.toolResult);
+  if (toolResult) {
+    return getString(toolResult, "content") ?? getString(toolResult, "output");
+  }
+  const errorField = getString(payload, "error") ?? getString(payload, "error_message");
+  if (errorField) {
+    return errorField;
+  }
+  return void 0;
+}
+function extractFinalMessageFromPayload(payload) {
+  const directMessage = getString(payload, "final_message") ?? getString(payload, "finalMessage") ?? getString(payload, "summary") ?? getString(payload, "completion_message");
+  if (directMessage) {
+    return directMessage;
+  }
+  const result = getString(payload, "result") ?? getString(payload, "output") ?? getString(payload, "message");
+  if (result) {
+    return result;
+  }
+  const stats = getRecord(payload.stats);
+  if (stats) {
+    return getString(stats, "summary") ?? getString(stats, "completion_summary");
+  }
+  return void 0;
+}
 
 // src/adapters/copilot-cli.ts
 import { execFile as execFileCallback5 } from "child_process";
@@ -10498,7 +10950,11 @@ var OpenCodeAdapter = class extends BaseAdapter {
         return;
       }
       case "session.deleted": {
-        await this.emitStateChange("session.end", sharedData, context);
+        const finalMessage = extractOpenCodeFinalMessage(payload);
+        await this.emitStateChange("session.end", {
+          ...sharedData,
+          finalMessage
+        }, context);
         return;
       }
       case "session.error": {
@@ -10523,12 +10979,22 @@ var OpenCodeAdapter = class extends BaseAdapter {
         return;
       }
       case "tool.execute.before": {
-        await this.emitStateChange("agent.tool_call", sharedData, context);
+        const toolCallName = extractOpenCodeToolName(payload);
+        await this.emitStateChange("agent.tool_call", {
+          ...sharedData,
+          toolCallName
+        }, context);
         return;
       }
       case "tool.execute.after": {
+        const toolCallName = extractOpenCodeToolName(payload);
+        const toolResult = extractOpenCodeToolResult(payload);
         const emittedType = isOpenCodeCodingTool(sharedData.toolName) ? "agent.coding" : "agent.tool_call";
-        await this.emitStateChange(emittedType, sharedData, context);
+        await this.emitStateChange(emittedType, {
+          ...sharedData,
+          toolCallName,
+          toolResult
+        }, context);
         return;
       }
       default: {
@@ -10695,6 +11161,535 @@ function getString10(payload, key) {
   const value = payload[key];
   return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 }
+function extractOpenCodeFinalMessage(payload) {
+  const directMessage = getString10(payload, "final_message") ?? getString10(payload, "finalMessage") ?? getString10(payload, "summary") ?? getString10(payload, "completion_message");
+  if (directMessage) {
+    return directMessage;
+  }
+  const result = getString10(payload, "result") ?? getString10(payload, "output") ?? getString10(getRecord9(payload.properties), "result");
+  if (result) {
+    return result;
+  }
+  return void 0;
+}
+function extractOpenCodeToolResult(payload) {
+  const directResult = getString10(payload, "result") ?? getString10(payload, "output") ?? getString10(payload, "toolResult");
+  if (directResult) {
+    return directResult;
+  }
+  const toolResult = getRecord9(payload.tool_result) ?? getRecord9(payload.toolResult);
+  if (toolResult) {
+    return getString10(toolResult, "content") ?? getString10(toolResult, "output");
+  }
+  const props = getRecord9(payload.properties);
+  if (props) {
+    const nestedResult = getRecord9(props.tool_result) ?? getRecord9(props.toolResult);
+    if (nestedResult) {
+      return getString10(nestedResult, "content") ?? getString10(nestedResult, "output");
+    }
+  }
+  return void 0;
+}
+
+// src/adapters/pi.ts
+import { execFile as execFile14 } from "child_process";
+import { join as join13 } from "path";
+import { promisify as promisify14 } from "util";
+var execFileAsync = promisify14(execFile14);
+var PiAdapter = class extends BaseAdapter {
+  displayName = "Pi (MiniMax)";
+  name = "pi";
+  strategies = [
+    "process-detect",
+    "api-client",
+    "log-watch"
+  ];
+  apiPort = 7890;
+  logPath;
+  poller = null;
+  activePiSessions = /* @__PURE__ */ new Map();
+  lastCheckedTime = 0;
+  constructor(options) {
+    super(options);
+    this.logPath = join13(
+      options.homeDirectory ?? process.env.HOME ?? "",
+      ".pi",
+      "agent.log"
+    );
+  }
+  start() {
+    if (this.getStatus().running) {
+      return Promise.resolve();
+    }
+    this.setRunning(true);
+    this.startPolling();
+    logger.info({ adapter: this.name }, "Pi adapter started");
+    return Promise.resolve();
+  }
+  stop() {
+    if (this.poller !== null) {
+      clearInterval(this.poller);
+      this.poller = null;
+    }
+    this.setRunning(false);
+    logger.info({ adapter: this.name }, "Pi adapter stopped");
+    return Promise.resolve();
+  }
+  async handleHook(payload) {
+    const normalized = this.parseNormalizedHookPayload(payload);
+    if (normalized === null) {
+      return;
+    }
+    const context = {
+      cwd: normalized.cwd,
+      pid: normalized.pid,
+      sessionId: normalized.sessionId,
+      source: "pi-hook"
+    };
+    const eventType = this.mapEventType(normalized.type ?? "");
+    const eventData = this.buildEventData(eventType, normalized);
+    await this.emit(eventType, eventData, context);
+  }
+  startPolling() {
+    this.poller = setInterval(() => {
+      void this.pollPiActivity();
+    }, 2e3);
+  }
+  async pollPiActivity() {
+    const running = await this.detectPiInstance();
+    if (!running) {
+      for (const [sessionId, activity] of this.activePiSessions) {
+        if (activity.state !== "idle") {
+          activity.state = "idle";
+          await this.emitIdle(sessionId);
+        }
+      }
+      return;
+    }
+    try {
+      const response = await fetch(
+        `http://127.0.0.1:${this.apiPort}/api/status`,
+        {
+          signal: AbortSignal.timeout(500)
+        }
+      );
+      if (response.ok) {
+        const data = await response.json();
+        await this.processPiApiResponse(data);
+      }
+    } catch {
+      await this.checkMiniMaxApi();
+    }
+  }
+  async detectPiInstance() {
+    try {
+      const result = await execFileAsync("pgrep", ["-l", "pi|minimax"]);
+      if (result.stdout.includes("pi") || result.stdout.includes("minimax")) {
+        return true;
+      }
+    } catch {
+    }
+    try {
+      const response = await fetch(
+        `http://127.0.0.1:${this.apiPort}/health`,
+        {
+          signal: AbortSignal.timeout(200)
+        }
+      );
+      if (response.ok) {
+        return true;
+      }
+    } catch {
+    }
+    return false;
+  }
+  async checkMiniMaxApi() {
+    try {
+      const response = await fetch("http://127.0.0.1:3000/api/agent/status", {
+        signal: AbortSignal.timeout(500)
+      });
+      if (response.ok) {
+        const data = await response.json();
+        await this.processPiApiResponse(data);
+      }
+    } catch {
+    }
+  }
+  async processPiApiResponse(data) {
+    const rawSession = data.sessionId ?? data.project ?? "default";
+    const sessionId = `pi:${rawSession.replace(/[^a-zA-Z0-9-_]/g, "-")}`;
+    let activity = this.activePiSessions.get(sessionId);
+    if (!activity) {
+      activity = { sessionId, state: "idle" };
+      this.activePiSessions.set(sessionId, activity);
+      await this.emitSessionStart(sessionId, data);
+    }
+    const rawState = data.state ?? "idle";
+    const state = rawState;
+    if (state !== activity.state) {
+      switch (state) {
+        case "thinking": {
+          const rawThinking = data.thinking;
+          if (rawThinking) {
+            await this.emitThinking(sessionId, rawThinking);
+          }
+          break;
+        }
+        case "tool": {
+          const rawFilePath = data.filePath;
+          const rawCommand = data.command;
+          const rawToolName = data.toolName ?? "unknown";
+          await this.emitToolCall(
+            sessionId,
+            {
+              filePath: rawFilePath ?? "",
+              command: rawCommand ?? ""
+            },
+            rawToolName
+          );
+          break;
+        }
+        case "output": {
+          const rawOutput = data.output;
+          if (rawOutput) {
+            await this.emitOutput(sessionId, rawOutput);
+          }
+          break;
+        }
+        case "error": {
+          const rawError = data.error ?? "Unknown error";
+          await this.emitError(sessionId, rawError);
+          break;
+        }
+        case "idle":
+          await this.emitIdle(sessionId);
+          break;
+      }
+      activity.state = state;
+    }
+  }
+  async emitSessionStart(sessionId, data) {
+    const rawProject = data.project ?? "pi-project";
+    const rawModel = data.model ?? "minimax/moonshot";
+    const eventData = {
+      state: "session.start",
+      project: rawProject,
+      model: rawModel,
+      raw: data
+    };
+    await this.emit("session.start", eventData, { sessionId });
+  }
+  async emitThinking(sessionId, content) {
+    if (!content) return;
+    const eventData = {
+      state: "agent.thinking",
+      thinkingContent: content
+    };
+    await this.emit("agent.thinking", eventData, { sessionId });
+  }
+  async emitToolCall(sessionId, toolInput, toolName) {
+    const eventData = {
+      state: "agent.tool_call",
+      toolCallName: toolName,
+      toolInput,
+      activeFile: toolInput.filePath
+    };
+    await this.emit("agent.tool_call", eventData, { sessionId });
+  }
+  async emitOutput(sessionId, content) {
+    if (!content) return;
+    const eventData = {
+      state: "agent.streaming",
+      messageContent: content
+    };
+    await this.emit("agent.streaming", eventData, { sessionId });
+  }
+  async emitError(sessionId, errorMessage) {
+    const eventData = {
+      state: "agent.error",
+      errorMessage,
+      errorType: "api_error"
+    };
+    await this.emit("agent.error", eventData, { sessionId });
+  }
+  async emitIdle(sessionId) {
+    const eventData = {
+      state: "agent.idle"
+    };
+    await this.emit("agent.idle", eventData, { sessionId });
+  }
+  mapEventType(type) {
+    const mapping = {
+      "session.start": "session.start",
+      "session.end": "session.end",
+      "task.start": "task.start",
+      "task.complete": "task.complete",
+      thinking: "agent.thinking",
+      tool: "agent.tool_call",
+      coding: "agent.coding",
+      output: "agent.streaming",
+      message: "agent.streaming",
+      ask: "agent.asking_user",
+      error: "agent.error",
+      idle: "agent.idle",
+      compact: "agent.compact"
+    };
+    return mapping[type] ?? "agent.streaming";
+  }
+  buildEventData(eventType, payload) {
+    const data = payload.data ?? {};
+    return {
+      state: eventType,
+      project: data.project,
+      activeFile: data.activeFile,
+      model: data.model,
+      toolInput: data.toolInput,
+      toolCallName: data.toolCallName,
+      thinkingContent: data.thinkingContent,
+      messageContent: data.messageContent,
+      finalMessage: data.finalMessage,
+      toolResult: data.toolResult,
+      errorMessage: data.errorMessage,
+      errorType: data.errorType,
+      raw: data.raw
+    };
+  }
+};
+
+// src/adapters/zed.ts
+import { readFile as readFile12 } from "fs/promises";
+import { basename as basename11, join as join14 } from "path";
+var ZedAdapter = class extends BaseAdapter {
+  displayName = "Zed AI";
+  name = "zed";
+  strategies = [
+    "process-detect",
+    "api-client"
+  ];
+  logPaths;
+  apiPort = 9876;
+  pollIntervalMs;
+  poller = null;
+  lastEventTime = 0;
+  activeZedSessions = /* @__PURE__ */ new Map();
+  constructor(options) {
+    super(options);
+    this.pollIntervalMs = 2e3;
+    this.logPaths = [
+      join14(options.homeDirectory ?? process.env.HOME ?? "", ".config", "zed", "logs", "agent.log"),
+      "/tmp/zed-agent.log"
+    ];
+  }
+  start() {
+    if (this.getStatus().running) {
+      return Promise.resolve();
+    }
+    this.setRunning(true);
+    this.startPolling();
+    logger.info({ adapter: this.name }, "Zed adapter started");
+    return Promise.resolve();
+  }
+  stop() {
+    if (this.poller !== null) {
+      clearInterval(this.poller);
+      this.poller = null;
+    }
+    this.setRunning(false);
+    logger.info({ adapter: this.name }, "Zed adapter stopped");
+    return Promise.resolve();
+  }
+  async handleHook(payload) {
+    const normalized = this.parseNormalizedHookPayload(payload);
+    if (normalized === null) {
+      return;
+    }
+    const context = {
+      cwd: normalized.cwd,
+      pid: normalized.pid,
+      sessionId: normalized.sessionId,
+      source: "zed-hook"
+    };
+    const eventType = this.mapEventType(normalized.type ?? "");
+    const eventData = this.buildEventData(eventType, normalized);
+    await this.emit(eventType, eventData, context);
+  }
+  startPolling() {
+    this.poller = setInterval(() => {
+      void this.pollZedStatus();
+    }, this.pollIntervalMs);
+  }
+  async pollZedStatus() {
+    try {
+      const response = await fetch(`http://127.0.0.1:${this.apiPort}/api/agent/status`, {
+        signal: AbortSignal.timeout(1e3)
+      });
+      if (response.ok) {
+        const data = await response.json();
+        if (data.sessionId && typeof data.sessionId === "string") {
+          const sessionId = `zed:${data.sessionId}`;
+          if (!this.activeZedSessions.has(sessionId)) {
+            this.activeZedSessions.set(sessionId, sessionId);
+            await this.emitSessionStart(sessionId, data);
+          }
+          if (data.state === "thinking" && this.lastEventTime < Date.now() - 5e3) {
+            const rawThinking = data.thinking;
+            if (rawThinking) {
+              await this.emitThinking(sessionId, rawThinking);
+            }
+          } else if (data.state === "tool" && data.toolName) {
+            const rawFilePath = data.filePath;
+            const rawCommand = data.command;
+            const rawToolName = data.toolName ?? "unknown";
+            await this.emitToolCall(
+              sessionId,
+              {
+                filePath: rawFilePath ?? "",
+                command: rawCommand ?? ""
+              },
+              rawToolName
+            );
+          } else if (data.state === "idle") {
+            await this.emitIdle(sessionId);
+          }
+        }
+      }
+    } catch {
+      await this.checkLogFiles();
+    }
+  }
+  async checkLogFiles() {
+    for (const logPath of this.logPaths) {
+      try {
+        const content = await readFile12(logPath, "utf8");
+        await this.parseLogContent(content);
+      } catch {
+      }
+    }
+  }
+  async parseLogContent(content) {
+    const lines = content.split("\n").filter((line) => line.trim());
+    for (const line of lines) {
+      if (this.lastEventTime > 0 && this.lastEventTime >= Date.now() - 2e3) {
+        continue;
+      }
+      const event = this.extractZedEventFromLog(line);
+      if (event) {
+        await this.handleHook(event);
+        this.lastEventTime = Date.now();
+      }
+    }
+  }
+  extractZedEventFromLog(line) {
+    try {
+      const parsed = JSON.parse(line);
+      if (!parsed.type || typeof parsed.type !== "string") {
+        return null;
+      }
+      const rawSessionId = parsed.sessionId;
+      const rawWorkspace = parsed.workspace;
+      const sessionId = rawSessionId ? rawSessionId : rawWorkspace ? `zed:${basename11(rawWorkspace)}` : `zed:${Date.now()}`;
+      const rawCwd = parsed.cwd ?? rawWorkspace;
+      return {
+        type: parsed.type,
+        sessionId,
+        cwd: rawCwd,
+        data: {
+          project: parsed.project ?? rawWorkspace ? basename11(String(rawWorkspace)) : void 0,
+          model: parsed.model,
+          state: parsed.type,
+          thinkingContent: parsed.thinking,
+          toolCallName: parsed.toolName,
+          toolInput: parsed.toolInput,
+          messageContent: parsed.message ?? parsed.output,
+          errorMessage: parsed.error,
+          raw: parsed
+        }
+      };
+    } catch {
+      if (line.includes("[zed:agent]")) {
+        const cleaned = line.replace(/^\[.*?\] \[.*?\] /, "");
+        if (cleaned.includes("Thinking:")) {
+          return { type: "thinking", thinkingContent: cleaned.replace("Thinking:", "").trim() };
+        }
+        if (cleaned.includes("Executing tool:")) {
+          return { type: "tool", toolCallName: cleaned.replace("Executing tool:", "").trim() };
+        }
+        if (cleaned.includes("Error:")) {
+          return { type: "error", errorMessage: cleaned.replace("Error:", "").trim() };
+        }
+      }
+      return null;
+    }
+  }
+  async emitSessionStart(sessionId, _data) {
+    const eventData = {
+      state: "session.start",
+      project: sessionId.split(":")[1] ?? "unknown"
+    };
+    await this.emit("session.start", eventData, { sessionId });
+  }
+  async emitThinking(sessionId, content) {
+    if (!content) return;
+    const eventData = {
+      state: "agent.thinking",
+      thinkingContent: content
+    };
+    await this.emit("agent.thinking", eventData, { sessionId });
+    this.lastEventTime = Date.now();
+  }
+  async emitToolCall(sessionId, toolInput, toolName) {
+    const eventData = {
+      state: "agent.tool_call",
+      toolCallName: toolName,
+      toolInput,
+      activeFile: toolInput.filePath
+    };
+    await this.emit("agent.tool_call", eventData, { sessionId });
+    this.lastEventTime = Date.now();
+  }
+  async emitIdle(sessionId) {
+    const eventData = {
+      state: "agent.idle"
+    };
+    await this.emit("agent.idle", eventData, { sessionId });
+  }
+  mapEventType(type) {
+    const mapping = {
+      "session.start": "session.start",
+      "session.end": "session.end",
+      "task.start": "task.start",
+      "task.complete": "task.complete",
+      thinking: "agent.thinking",
+      tool: "agent.tool_call",
+      coding: "agent.coding",
+      output: "agent.streaming",
+      message: "agent.streaming",
+      ask: "agent.asking_user",
+      error: "agent.error",
+      idle: "agent.idle",
+      compact: "agent.compact"
+    };
+    return mapping[type] ?? "agent.streaming";
+  }
+  buildEventData(eventType, payload) {
+    const data = payload.data ?? {};
+    return {
+      state: eventType,
+      project: data.project,
+      activeFile: data.activeFile,
+      model: data.model,
+      toolInput: data.toolInput,
+      toolCallName: data.toolCallName,
+      thinkingContent: data.thinkingContent,
+      messageContent: data.messageContent,
+      finalMessage: data.finalMessage,
+      toolResult: data.toolResult,
+      errorMessage: data.errorMessage,
+      errorType: data.errorType,
+      raw: data.raw
+    };
+  }
+};
 
 // src/adapters/registry.ts
 var AdapterRegistry = class {
@@ -10779,7 +11774,9 @@ function createDefaultAdapters(options) {
     new KiloAdapter(options),
     new CodexAdapter(options),
     new OpenClawAdapter(options),
-    new OpenCodeAdapter(options)
+    new OpenCodeAdapter(options),
+    new PiAdapter(options),
+    new ZedAdapter(options)
   ];
 }
 
@@ -10800,7 +11797,7 @@ function getSocketPath(aisnitchHomePath) {
   if (process.platform === "win32") {
     return "\\\\.\\pipe\\aisnitch.sock";
   }
-  return join13(aisnitchHomePath, "aisnitch.sock");
+  return join15(aisnitchHomePath, "aisnitch.sock");
 }
 var Pipeline = class {
   eventBus = new EventBus();
@@ -11005,6 +12002,30 @@ var Pipeline = class {
   getEventBus() {
     return this.eventBus;
   }
+  /**
+   * Returns the adapter registry for graceful shutdown coordination.
+   */
+  getAdapterRegistry() {
+    return this.adapterRegistry ?? void 0;
+  }
+  /**
+   * Returns the HTTP receiver for graceful shutdown coordination.
+   */
+  getHttpReceiver() {
+    return this.httpReceiver;
+  }
+  /**
+   * Returns the UDS server for graceful shutdown coordination.
+   */
+  getUdsServer() {
+    return this.udsServer;
+  }
+  /**
+   * Returns the WebSocket server for graceful shutdown coordination.
+   */
+  getWsServer() {
+    return this.wsServer;
+  }
   getHealthSnapshot() {
     const status = this.getStatus();
     return {
@@ -11085,6 +12106,116 @@ var Pipeline = class {
   }
 };
 
+// src/core/timeout.ts
+var DEFAULT_TIMEOUTS = Object.freeze({
+  /**
+   * File read/write operations (JSONL transcripts, config files).
+   * Default: 5 seconds
+   */
+  fileOperation: 5e3,
+  /**
+   * HTTP requests to health endpoint or external APIs.
+   * Default: 30 seconds
+   */
+  httpRequest: 3e4,
+  /**
+   * Process detection commands (`pgrep`, `ps aux`).
+   * Default: 3 seconds
+   */
+  processDetection: 3e3,
+  /**
+   * Adapter startup (file watchers, hook bridges, pollers).
+   * Default: 10 seconds
+   */
+  adapterStartup: 1e4,
+  /**
+   * Adapter shutdown (graceful cleanup, watcher close).
+   * Default: 5 seconds — after this, resources are force-closed
+   */
+  adapterShutdown: 5e3,
+  /**
+   * Daemon graceful shutdown (stop all components in order).
+   * Default: 30 seconds
+   */
+  daemonShutdown: 3e4,
+  /**
+   * WebSocket connection establishment.
+   * Default: 10 seconds
+   */
+  wsConnection: 1e4,
+  /**
+   * Overall pipeline start (all components).
+   * Default: 15 seconds
+   */
+  pipelineStartup: 15e3
+});
+
+// src/core/graceful-shutdown.ts
+async function withShutdownTimeout(fn, timeoutMs, component) {
+  if (timeoutMs <= 0) {
+    await fn();
+    return;
+  }
+  const timeoutPromise = new Promise((resolve2) => {
+    setTimeout(() => {
+      resolve2("timed_out");
+    }, timeoutMs).unref();
+  });
+  const result = await Promise.race([
+    fn().then(() => "completed"),
+    timeoutPromise
+  ]);
+  if (result === "timed_out") {
+    logger.warn(
+      { component, timeoutMs },
+      `Graceful shutdown exceeded ${timeoutMs}ms timeout \u2014 forcing through`
+    );
+  }
+}
+async function shutdownInOrder(components, timeouts, label) {
+  const getTimeout = (key) => {
+    return timeouts[key] ?? DEFAULT_TIMEOUTS.daemonShutdown;
+  };
+  const stopSafely = async (key, fn) => {
+    const timeoutMs = getTimeout(key);
+    try {
+      await withShutdownTimeout(fn, timeoutMs, `${label}.${key}`);
+    } catch (error) {
+      logger.warn(
+        { error, key, label },
+        `Error during shutdown of ${key} \u2014 continuing with remaining components`
+      );
+    }
+  };
+  if (components.cleanupFns) {
+    for (const cleanupFn of components.cleanupFns) {
+      try {
+        await withShutdownTimeout(
+          async () => {
+            const result = cleanupFn();
+            if (result instanceof Promise) {
+              await result;
+            }
+          },
+          1e3,
+          `${label}.cleanup`
+        );
+      } catch (error) {
+        logger.warn({ error, label }, "Cleanup function failed");
+      }
+    }
+  }
+  if (components.eventBus) {
+    components.eventBus.unsubscribeAll();
+  }
+  await stopSafely("wsServer", () => components.wsServer.stop());
+  await stopSafely("udsServer", () => components.udsServer.stop());
+  await stopSafely("httpReceiver", () => components.httpReceiver.stop());
+  if (components.adapterRegistry) {
+    await stopSafely("adapterRegistry", () => components.adapterRegistry.stopAll());
+  }
+}
+
 // src/tui/index.tsx
 import { render } from "ink";
 import { withFullScreen } from "fullscreen-ink";
@@ -11288,9 +12419,11 @@ var TOOL_COLORS = {
   "openhands": "#facc15",
   "openclaw": "#ef4444",
   "opencode": "#10b981",
+  "pi": "#1db954",
   "qwen-code": "#22c55e",
   "unknown": "#94a3b8",
-  "windsurf": "#a855f7"
+  "windsurf": "#a855f7",
+  "zed": "#e85d04"
 };
 var EVENT_COLORS = {
   "agent.asking_user": "#ef4444",
@@ -13044,10 +14177,10 @@ async function renderManagedTui(options) {
 
 // src/cli/pid.ts
 import { constants as constants3 } from "fs";
-import { mkdir as mkdir3, readFile as readFile12, rm as rm3, stat as stat10, writeFile as writeFile3, access as access3 } from "fs/promises";
+import { mkdir as mkdir3, readFile as readFile13, rm as rm3, stat as stat10, writeFile as writeFile3, access as access3 } from "fs/promises";
 import { createConnection as createConnection2 } from "net";
 import { homedir as homedir4 } from "os";
-import { dirname as dirname7, join as join14 } from "path";
+import { dirname as dirname7, join as join16 } from "path";
 import { z as z5 } from "zod";
 var DaemonStateSchema = z5.strictObject({
   pid: z5.number().int().positive(),
@@ -13062,7 +14195,7 @@ function getDefaultSocketPath(options) {
   if (process.platform === "win32") {
     return "\\\\.\\pipe\\aisnitch.sock";
   }
-  return join14(getAISnitchHomePath(options), "aisnitch.sock");
+  return join16(getAISnitchHomePath(options), "aisnitch.sock");
 }
 async function cleanupSocketPathIfStale(socketPath) {
   if (process.platform === "win32") {
@@ -13097,16 +14230,16 @@ async function cleanupSocketPathIfStale(socketPath) {
   return true;
 }
 function getPidFilePath(options = {}) {
-  return join14(getAISnitchHomePath(options), "aisnitch.pid");
+  return join16(getAISnitchHomePath(options), "aisnitch.pid");
 }
 function getDaemonStatePath(options = {}) {
-  return join14(getAISnitchHomePath(options), "daemon-state.json");
+  return join16(getAISnitchHomePath(options), "daemon-state.json");
 }
 function getDaemonLogPath(options = {}) {
-  return join14(getAISnitchHomePath(options), "daemon.log");
+  return join16(getAISnitchHomePath(options), "daemon.log");
 }
 function getLaunchAgentPath(options = {}) {
-  return join14(
+  return join16(
     options.launchAgentHomeDirectory ?? homedir4(),
     "Library",
     "LaunchAgents",
@@ -13122,7 +14255,7 @@ async function writePid(pid, options = {}) {
 }
 async function readPid(options = {}) {
   try {
-    const rawPid = await readFile12(getPidFilePath(options), "utf8");
+    const rawPid = await readFile13(getPidFilePath(options), "utf8");
     const parsedPid = Number.parseInt(rawPid.trim(), 10);
     if (!Number.isInteger(parsedPid) || parsedPid <= 0) {
       throw new Error("Invalid PID file contents.");
@@ -13152,7 +14285,7 @@ async function writeDaemonState(state, options = {}) {
 }
 async function readDaemonState(options = {}) {
   try {
-    const rawJson = await readFile12(getDaemonStatePath(options), "utf8");
+    const rawJson = await readFile13(getDaemonStatePath(options), "utf8");
     const parsedJson = JSON.parse(rawJson);
     return DaemonStateSchema.parse(parsedJson);
   } catch (error) {
@@ -13220,9 +14353,9 @@ function getEffectiveCliConfigPath(options = {}) {
 
 // src/cli/auto-update.ts
 import { spawn as spawnChildProcess } from "child_process";
-import { mkdir as mkdir4, readFile as readFile13, writeFile as writeFile4 } from "fs/promises";
+import { mkdir as mkdir4, readFile as readFile14, writeFile as writeFile4 } from "fs/promises";
 import { realpath } from "fs/promises";
-import { join as join15 } from "path";
+import { join as join17 } from "path";
 var AUTO_UPDATE_STATE_FILE = "auto-update.json";
 var AUTO_UPDATE_LOG_FILE = "auto-update.log";
 function createAutoUpdateController(dependencies = {}) {
@@ -13237,7 +14370,7 @@ function createAutoUpdateController(dependencies = {}) {
       const args = resolveUpdateArgs(options.manager);
       const aisnitchHomePath = getAISnitchHomePath(pathOptions);
       await mkdir4(aisnitchHomePath, { recursive: true });
-      const logFilePath = join15(aisnitchHomePath, AUTO_UPDATE_LOG_FILE);
+      const logFilePath = join17(aisnitchHomePath, AUTO_UPDATE_LOG_FILE);
       const startedAt = now().toISOString();
       await writeAutoUpdateState(
         {
@@ -13425,7 +14558,7 @@ function resolveUpdateArgs(manager) {
 async function readAutoUpdateState(options) {
   const statePath = getAutoUpdateStatePath(options);
   try {
-    const rawJson = await readFile13(statePath, "utf8");
+    const rawJson = await readFile14(statePath, "utf8");
     return JSON.parse(rawJson);
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
@@ -13445,7 +14578,7 @@ async function writeAutoUpdateState(state, options) {
   );
 }
 function getAutoUpdateStatePath(options) {
-  return join15(getAISnitchHomePath(options), AUTO_UPDATE_STATE_FILE);
+  return join17(getAISnitchHomePath(options), AUTO_UPDATE_STATE_FILE);
 }
 function toPathOptions(options) {
   return {
@@ -13636,7 +14769,7 @@ function isRecord13(value) {
 }
 
 // src/cli/runtime.ts
-var execFile14 = promisify14(execFileCallback14);
+var execFile15 = promisify15(execFileCallback14);
 var DAEMON_READY_TIMEOUT_MS = 4e3;
 var DAEMON_READY_POLL_INTERVAL_MS = 100;
 var DAEMON_STOP_TIMEOUT_MS = 4e3;
@@ -13652,7 +14785,7 @@ function createCliRuntime(dependencies = {}) {
     spawn: spawnImplementation
   });
   const execFileImplementation = dependencies.execFile ?? (async (file, args) => {
-    return await execFile14(file, [...args], {
+    return await execFile15(file, [...args], {
       encoding: "utf8"
     });
   });
@@ -13827,7 +14960,7 @@ function createCliRuntime(dependencies = {}) {
   }
   async function readDaemonStartupFailure(pathOptions) {
     try {
-      const daemonLog = await readFile14(getDaemonLogPath(pathOptions), "utf8");
+      const daemonLog = await readFile15(getDaemonLogPath(pathOptions), "utf8");
       const logLines = daemonLog.split(/\r?\n/u).map((line) => line.trim()).filter((line) => line.length > 0);
       const lastLine = logLines.at(-1);
       if (!lastLine) {
@@ -13925,22 +15058,35 @@ function createCliRuntime(dependencies = {}) {
         return;
       }
       shuttingDown = true;
-      try {
-        await pipeline.stop();
-      } finally {
-        if (daemonMode) {
-          const daemonPathOptions = toPathOptions2(options);
+      const shutdownTimeouts = {
+        adapterRegistry: DEFAULT_TIMEOUTS.adapterShutdown,
+        httpReceiver: DEFAULT_TIMEOUTS.httpRequest,
+        udsServer: DEFAULT_TIMEOUTS.fileOperation,
+        wsServer: DEFAULT_TIMEOUTS.wsConnection,
+        cleanupFns: 1e3
+      };
+      const components = {
+        adapterRegistry: pipeline.getAdapterRegistry(),
+        httpReceiver: pipeline.getHttpReceiver(),
+        udsServer: pipeline.getUdsServer(),
+        wsServer: pipeline.getWsServer(),
+        eventBus: pipeline.getEventBus(),
+        cleanupFns: daemonMode ? [async () => {
           await Promise.all([
-            removePid(daemonPathOptions),
-            removeDaemonState(daemonPathOptions)
+            removePid(toPathOptions2(options)),
+            removeDaemonState(toPathOptions2(options))
           ]);
-        }
-      }
-      if (!daemonMode) {
-        output.stdout(`AISnitch stopped after ${signal}.
+        }] : []
+      };
+      try {
+        await shutdownInOrder(components, shutdownTimeouts, "pipeline");
+      } finally {
+        if (!daemonMode) {
+          output.stdout(`AISnitch stopped after ${signal}.
 `);
+        }
+        process.exit(exitCode);
       }
-      process.exit(exitCode);
     };
     if (daemonMode) {
       process.once("SIGTERM", () => {
@@ -14197,7 +15343,7 @@ function createCliRuntime(dependencies = {}) {
     }
     const { config } = await loadEffectiveConfig(options);
     setLoggerLevel(getForegroundSafeLogLevel(config.logLevel, false));
-    const ephemeralHomeDirectory = await mkdtemp(join16(tmpdir(), "aisnitch-mock-"));
+    const ephemeralHomeDirectory = await mkdtemp(join18(tmpdir(), "aisnitch-mock-"));
     const ephemeralPipeline = new Pipeline();
     const status2 = await ephemeralPipeline.start({
       config: {
@@ -14281,7 +15427,7 @@ function createCliRuntime(dependencies = {}) {
     } else {
       const { config } = await loadEffectiveConfig(options);
       setLoggerLevel(getForegroundSafeLogLevel(config.logLevel, false));
-      ephemeralHomeDirectory = await mkdtemp(join16(tmpdir(), "aisnitch-wrap-"));
+      ephemeralHomeDirectory = await mkdtemp(join18(tmpdir(), "aisnitch-wrap-"));
       ephemeralPipeline = new Pipeline();
       await ephemeralPipeline.start({
         config: {
@@ -14356,7 +15502,7 @@ function createCliRuntime(dependencies = {}) {
           },
           pid: process.ppid > 1 ? process.ppid : void 0,
           source: "aisnitch://adapters/aider/notifications-command",
-          transcriptPath: join16(process.cwd(), ".aider.chat.history.md"),
+          transcriptPath: join18(process.cwd(), ".aider.chat.history.md"),
           type: "agent.idle"
         }),
         headers: {
@@ -14557,7 +15703,7 @@ function joinSocketPath(pathOptions) {
 }
 function resolveCliEntryPath() {
   const cliEntryPath = process.argv[1];
-  if (!cliEntryPath || basename11(cliEntryPath).length === 0) {
+  if (!cliEntryPath || basename12(cliEntryPath).length === 0) {
     throw new Error("Unable to resolve the AISnitch CLI entry path.");
   }
   return cliEntryPath;