ctb 1.1.0 → 1.3.0

package/src/types.ts

@@ -7,70 +7,71 @@ import type { Message } from "grammy/types";
 
 // Status callback for streaming updates
 export type StatusCallback = (
-  type: "thinking" | "tool" | "text" | "segment_end" | "done",
-  content: string,
-  segmentId?: number
+	type: "thinking" | "tool" | "text" | "segment_end" | "done",
+	content: string,
+	segmentId?: number,
 ) => Promise<void>;
 
 // Rate limit bucket for token bucket algorithm
 export interface RateLimitBucket {
-  tokens: number;
-  lastUpdate: number;
+	tokens: number;
+	lastUpdate: number;
 }
 
 // Session persistence data
 export interface SessionData {
-  session_id: string;
-  saved_at: string;
-  working_dir: string;
+	version: number;
+	session_id: string;
+	saved_at: string;
+	working_dir: string;
 }
 
 // Token usage from Claude
 export interface TokenUsage {
-  input_tokens: number;
-  output_tokens: number;
-  cache_read_input_tokens?: number;
-  cache_creation_input_tokens?: number;
+	input_tokens: number;
+	output_tokens: number;
+	cache_read_input_tokens?: number;
+	cache_creation_input_tokens?: number;
 }
 
 // MCP server configuration types
 export type McpServerConfig = McpStdioConfig | McpHttpConfig;
 
 export interface McpStdioConfig {
-  command: string;
-  args?: string[];
-  env?: Record<string, string>;
+	command: string;
+	args?: string[];
+	env?: Record<string, string>;
 }
 
 export interface McpHttpConfig {
-  type: "http";
-  url: string;
-  headers?: Record<string, string>;
+	type: "http";
+	url: string;
+	headers?: Record<string, string>;
 }
 
 // Audit log event types
 export type AuditEventType =
-  | "message"
-  | "auth"
-  | "tool_use"
-  | "error"
-  | "rate_limit";
+	| "message"
+	| "auth"
+	| "tool_use"
+	| "error"
+	| "rate_limit";
 
 export interface AuditEvent {
-  timestamp: string;
-  event: AuditEventType;
-  user_id: number;
-  username?: string;
-  [key: string]: unknown;
+	timestamp: string;
+	event: AuditEventType;
+	user_id: number;
+	username?: string;
+	[key: string]: unknown;
 }
 
 // Pending media group for buffering albums
 export interface PendingMediaGroup {
-  items: string[];
-  ctx: Context;
-  caption?: string;
-  statusMsg?: Message;
-  timeout: Timer;
+	items: string[];
+	ctx: Context;
+	caption?: string;
+	statusMsg?: Message;
+	timeout: Timer;
 }
 
 // Bot context with optional message

package/src/utils.ts

@@ -14,6 +14,7 @@ import {
 	TRANSCRIPTION_AVAILABLE,
 	TRANSCRIPTION_PROMPT,
 } from "./config";
+import { botEvents } from "./events";
 import type { AuditEvent } from "./types";
 
 // ============== OpenAI Client ==============
@@ -211,35 +212,17 @@ export function startTypingIndicator(ctx: Context): TypingController {
 
 // ============== Message Interrupt ==============
 
-// Import session lazily to avoid circular dependency
-let sessionModule: {
-	session: {
-		isRunning: boolean;
-		stop: () => Promise<"stopped" | "pending" | false>;
-		markInterrupt: () => void;
-		clearStopRequested: () => void;
-	};
-} | null = null;
-
 export async function checkInterrupt(text: string): Promise<string> {
 	if (!text || !text.startsWith("!")) {
 		return text;
 	}
 
-	// Lazy import to avoid circular dependency
-	if (!sessionModule) {
-		sessionModule = await import("./session");
-	}
-
 	const strippedText = text.slice(1).trimStart();
 
-	if (sessionModule.session.isRunning) {
-		console.log("! prefix - interrupting current query");
-		sessionModule.session.markInterrupt();
-		await sessionModule.session.stop();
+	if (botEvents.getSessionState()) {
+		console.log("! prefix - requesting interrupt");
+		botEvents.emit("interruptRequested", undefined);
 		await Bun.sleep(100);
-		// Clear stopRequested so the new message can proceed
-		sessionModule.session.clearStopRequested();
 	}
 
 	return strippedText;