@mseep/obsidian-agent-client 0.10.6

package/src/services/message-state.ts

@@ -0,0 +1,375 @@
+/**
+ * Pure functions for message state updates.
+ *
+ * These functions are extracted from useMessages to keep the hook thin
+ * and to allow independent testing. They handle message array transformations
+ * for streaming updates, tool call management, and permission state.
+ */
+
+import type {
+	ChatMessage,
+	MessageContent,
+	ActivePermission,
+	PermissionOption,
+} from "../types/chat";
+import type { SessionUpdate } from "../types/session";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+/** Tool call content type extracted for type safety */
+export type ToolCallMessageContent = Extract<
+	MessageContent,
+	{ type: "tool_call" }
+>;
+
+// ============================================================================
+// Tool Call Merge
+// ============================================================================
+
+/**
+ * Merge new tool call content into existing tool call.
+ * Preserves existing values when new values are undefined.
+ */
+export function mergeToolCallContent(
+	existing: ToolCallMessageContent,
+	update: ToolCallMessageContent,
+): ToolCallMessageContent {
+	// Merge content arrays
+	let mergedContent = existing.content || [];
+	if (update.content !== undefined) {
+		const newContent = update.content || [];
+
+		// If new content contains diff, replace all old diffs
+		const hasDiff = newContent.some((item) => item.type === "diff");
+		if (hasDiff) {
+			mergedContent = mergedContent.filter(
+				(item) => item.type !== "diff",
+			);
+		}
+
+		mergedContent = [...mergedContent, ...newContent];
+	}
+
+	return {
+		...existing,
+		toolCallId: update.toolCallId,
+		title: update.title !== undefined ? update.title : existing.title,
+		kind: update.kind !== undefined ? update.kind : existing.kind,
+		status: update.status !== undefined ? update.status : existing.status,
+		content: mergedContent,
+		locations:
+			update.locations !== undefined
+				? update.locations
+				: existing.locations,
+		rawInput:
+			update.rawInput !== undefined &&
+			Object.keys(update.rawInput).length > 0
+				? update.rawInput
+				: existing.rawInput,
+		permissionRequest:
+			update.permissionRequest !== undefined
+				? update.permissionRequest
+				: existing.permissionRequest,
+	};
+}
+
+// ============================================================================
+// Message Array Update Functions (for batching)
+// ============================================================================
+
+/**
+ * Apply a "last assistant message" update to the messages array.
+ * Creates a new assistant message if needed.
+ */
+export function applyUpdateLastMessage(
+	prev: ChatMessage[],
+	content: MessageContent,
+): ChatMessage[] {
+	if (prev.length === 0 || prev[prev.length - 1].role !== "assistant") {
+		const newMessage: ChatMessage = {
+			id: crypto.randomUUID(),
+			role: "assistant",
+			content: [content],
+			timestamp: new Date(),
+		};
+		return [...prev, newMessage];
+	}
+
+	const lastMessage = prev[prev.length - 1];
+	const updatedMessage = { ...lastMessage };
+
+	if (content.type === "text" || content.type === "agent_thought") {
+		const existingContentIndex = updatedMessage.content.findIndex(
+			(c) => c.type === content.type,
+		);
+		if (existingContentIndex >= 0) {
+			const existingContent =
+				updatedMessage.content[existingContentIndex];
+			if (
+				existingContent.type === "text" ||
+				existingContent.type === "agent_thought"
+			) {
+				updatedMessage.content[existingContentIndex] = {
+					type: content.type,
+					text: existingContent.text + content.text,
+				};
+			}
+		} else {
+			updatedMessage.content.push(content);
+		}
+	} else {
+		const existingIndex = updatedMessage.content.findIndex(
+			(c) => c.type === content.type,
+		);
+		if (existingIndex >= 0) {
+			updatedMessage.content[existingIndex] = content;
+		} else {
+			updatedMessage.content.push(content);
+		}
+	}
+
+	return [...prev.slice(0, -1), updatedMessage];
+}
+
+/**
+ * Apply a "last user message" update to the messages array.
+ * Creates a new user message if needed. Used for session/load history replay.
+ */
+export function applyUpdateUserMessage(
+	prev: ChatMessage[],
+	content: MessageContent,
+): ChatMessage[] {
+	if (prev.length === 0 || prev[prev.length - 1].role !== "user") {
+		const newMessage: ChatMessage = {
+			id: crypto.randomUUID(),
+			role: "user",
+			content: [content],
+			timestamp: new Date(),
+		};
+		return [...prev, newMessage];
+	}
+
+	const lastMessage = prev[prev.length - 1];
+	const updatedMessage = { ...lastMessage };
+
+	if (content.type === "text") {
+		const existingContentIndex = updatedMessage.content.findIndex(
+			(c) => c.type === "text",
+		);
+		if (existingContentIndex >= 0) {
+			const existingContent =
+				updatedMessage.content[existingContentIndex];
+			if (existingContent.type === "text") {
+				updatedMessage.content[existingContentIndex] = {
+					type: "text",
+					text: existingContent.text + content.text,
+				};
+			}
+		} else {
+			updatedMessage.content.push(content);
+		}
+	} else {
+		const existingIndex = updatedMessage.content.findIndex(
+			(c) => c.type === content.type,
+		);
+		if (existingIndex >= 0) {
+			updatedMessage.content[existingIndex] = content;
+		} else {
+			updatedMessage.content.push(content);
+		}
+	}
+
+	return [...prev.slice(0, -1), updatedMessage];
+}
+
+/**
+ * Apply a tool call upsert to the messages array.
+ * If a tool call with the given ID exists, merges. Otherwise creates new message.
+ */
+export function applyUpsertToolCall(
+	prev: ChatMessage[],
+	content: ToolCallMessageContent,
+	toolCallIndex: Map<string, number>,
+): ChatMessage[] {
+	// O(1) lookup via index
+	const messageIdx = toolCallIndex.get(content.toolCallId);
+	if (messageIdx !== undefined && messageIdx < prev.length) {
+		const message = prev[messageIdx];
+		const hasTarget = message.content.some(
+			(c) =>
+				c.type === "tool_call" && c.toolCallId === content.toolCallId,
+		);
+		if (hasTarget) {
+			const updatedMessage = {
+				...message,
+				content: message.content.map((c) => {
+					if (
+						c.type === "tool_call" &&
+						c.toolCallId === content.toolCallId
+					) {
+						return mergeToolCallContent(c, content);
+					}
+					return c;
+				}),
+			};
+			const result = [...prev];
+			result[messageIdx] = updatedMessage;
+			return result;
+		}
+	}
+
+	// Fallback: linear scan (index miss or stale index)
+	let found = false;
+	const updated = prev.map((message, idx) => {
+		const hasTarget = message.content.some(
+			(c) =>
+				c.type === "tool_call" && c.toolCallId === content.toolCallId,
+		);
+		if (!hasTarget) return message;
+		found = true;
+		toolCallIndex.set(content.toolCallId, idx); // Fix stale index
+		return {
+			...message,
+			content: message.content.map((c) => {
+				if (
+					c.type === "tool_call" &&
+					c.toolCallId === content.toolCallId
+				) {
+					return mergeToolCallContent(c, content);
+				}
+				return c;
+			}),
+		};
+	});
+
+	if (found) return updated;
+
+	// Not found: create new message and register in index
+	toolCallIndex.set(content.toolCallId, prev.length);
+	return [
+		...prev,
+		{
+			id: crypto.randomUUID(),
+			role: "assistant" as const,
+			content: [content],
+			timestamp: new Date(),
+		},
+	];
+}
+
+/**
+ * Rebuild the tool call index from a messages array.
+ */
+export function rebuildToolCallIndex(
+	messages: ChatMessage[],
+	toolCallIndex: Map<string, number>,
+): void {
+	toolCallIndex.clear();
+	messages.forEach((msg, msgIdx) => {
+		for (const c of msg.content) {
+			if (c.type === "tool_call") {
+				toolCallIndex.set(c.toolCallId, msgIdx);
+			}
+		}
+	});
+}
+
+/**
+ * Apply a single session update to the messages array.
+ * Returns the same array reference if no change (session-level updates).
+ */
+export function applySingleUpdate(
+	prev: ChatMessage[],
+	update: SessionUpdate,
+	toolCallIndex: Map<string, number>,
+): ChatMessage[] {
+	switch (update.type) {
+		case "agent_message_chunk":
+			return applyUpdateLastMessage(prev, {
+				type: "text",
+				text: update.text,
+			});
+		case "agent_thought_chunk":
+			return applyUpdateLastMessage(prev, {
+				type: "agent_thought",
+				text: update.text,
+			});
+		case "user_message_chunk":
+			return applyUpdateUserMessage(prev, {
+				type: "text",
+				text: update.text,
+			});
+		case "tool_call":
+		case "tool_call_update":
+			return applyUpsertToolCall(
+				prev,
+				{
+					type: "tool_call",
+					toolCallId: update.toolCallId,
+					title: update.title,
+					status: update.status || "pending",
+					kind: update.kind,
+					content: update.content,
+					locations: update.locations,
+					rawInput: update.rawInput,
+					permissionRequest: update.permissionRequest,
+				},
+				toolCallIndex,
+			);
+		case "plan":
+			return applyUpdateLastMessage(prev, {
+				type: "plan",
+				entries: update.entries,
+			});
+		default:
+			return prev;
+	}
+}
+
+// ============================================================================
+// Permission Helper Functions
+// ============================================================================
+
+/**
+ * Find the active permission request from messages.
+ */
+export function findActivePermission(
+	messages: ChatMessage[],
+): ActivePermission | null {
+	for (const message of messages) {
+		for (const content of message.content) {
+			if (content.type === "tool_call") {
+				const permission = content.permissionRequest;
+				if (permission?.isActive) {
+					return {
+						requestId: permission.requestId,
+						toolCallId: content.toolCallId,
+						options: permission.options,
+					};
+				}
+			}
+		}
+	}
+	return null;
+}
+
+/**
+ * Select an option from the available options based on preferred kinds.
+ */
+export function selectOption(
+	options: PermissionOption[],
+	preferredKinds: PermissionOption["kind"][],
+	fallback?: (option: PermissionOption) => boolean,
+): PermissionOption | undefined {
+	for (const kind of preferredKinds) {
+		const match = options.find((opt) => opt.kind === kind);
+		if (match) return match;
+	}
+	if (fallback) {
+		const fallbackOption = options.find(fallback);
+		if (fallbackOption) return fallbackOption;
+	}
+	return options[0];
+}

package/src/services/session-helpers.ts

@@ -0,0 +1,211 @@
+/**
+ * Pure helper functions for agent session management.
+ * Extracted from useSession hook for reusability and testability.
+ */
+
+import type { AgentClientPluginSettings } from "../plugin";
+import type {
+	BaseAgentSettings,
+	ClaudeAgentSettings,
+	GeminiAgentSettings,
+	CodexAgentSettings,
+} from "../types/agent";
+import type { ChatSession } from "../types/session";
+import { toAgentConfig } from "./settings-normalizer";
+import type { AgentUpdateNotification } from "./update-checker";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+/**
+ * Agent information for display.
+ * (Inlined from SwitchAgentUseCase)
+ */
+export interface AgentDisplayInfo {
+	/** Unique agent ID */
+	id: string;
+	/** Display name for UI */
+	displayName: string;
+}
+
+// ============================================================================
+// Helper Functions (Inlined from SwitchAgentUseCase)
+// ============================================================================
+
+/**
+ * Get the default agent ID from settings (for new views).
+ */
+export function getDefaultAgentId(settings: AgentClientPluginSettings): string {
+	return settings.defaultAgentId || settings.claude.id;
+}
+
+/**
+ * Get list of all available agents from settings.
+ */
+export function getAvailableAgentsFromSettings(
+	settings: AgentClientPluginSettings,
+): AgentDisplayInfo[] {
+	return [
+		{
+			id: settings.claude.id,
+			displayName: settings.claude.displayName || settings.claude.id,
+		},
+		{
+			id: settings.codex.id,
+			displayName: settings.codex.displayName || settings.codex.id,
+		},
+		{
+			id: settings.gemini.id,
+			displayName: settings.gemini.displayName || settings.gemini.id,
+		},
+		...settings.customAgents.map((agent) => ({
+			id: agent.id,
+			displayName: agent.displayName || agent.id,
+		})),
+	];
+}
+
+/**
+ * Get the currently active agent information from settings.
+ */
+export function getCurrentAgent(
+	settings: AgentClientPluginSettings,
+	agentId?: string,
+): AgentDisplayInfo {
+	const activeId = agentId || getDefaultAgentId(settings);
+	const agents = getAvailableAgentsFromSettings(settings);
+	return (
+		agents.find((agent) => agent.id === activeId) || {
+			id: activeId,
+			displayName: activeId,
+		}
+	);
+}
+
+// ============================================================================
+// Helper Functions (Inlined from ManageSessionUseCase)
+// ============================================================================
+
+/**
+ * Find agent settings by ID from plugin settings.
+ */
+export function findAgentSettings(
+	settings: AgentClientPluginSettings,
+	agentId: string,
+): BaseAgentSettings | null {
+	if (agentId === settings.claude.id) {
+		return settings.claude;
+	}
+	if (agentId === settings.codex.id) {
+		return settings.codex;
+	}
+	if (agentId === settings.gemini.id) {
+		return settings.gemini;
+	}
+	// Search in custom agents
+	const customAgent = settings.customAgents.find(
+		(agent) => agent.id === agentId,
+	);
+	return customAgent || null;
+}
+
+/**
+ * Build AgentConfig with API key injection for known agents.
+ */
+export function buildAgentConfigWithApiKey(
+	settings: AgentClientPluginSettings,
+	agentSettings: BaseAgentSettings,
+	agentId: string,
+	workingDirectory: string,
+) {
+	const baseConfig = toAgentConfig(agentSettings, workingDirectory);
+
+	// Add API keys to environment for Claude, Codex, and Gemini
+	if (agentId === settings.claude.id) {
+		const claudeSettings = agentSettings as ClaudeAgentSettings;
+		return {
+			...baseConfig,
+			env: {
+				...baseConfig.env,
+				ANTHROPIC_API_KEY: claudeSettings.apiKey,
+			},
+		};
+	}
+	if (agentId === settings.codex.id) {
+		const codexSettings = agentSettings as CodexAgentSettings;
+		return {
+			...baseConfig,
+			env: {
+				...baseConfig.env,
+				OPENAI_API_KEY: codexSettings.apiKey,
+			},
+		};
+	}
+	if (agentId === settings.gemini.id) {
+		const geminiSettings = agentSettings as GeminiAgentSettings;
+		return {
+			...baseConfig,
+			env: {
+				...baseConfig.env,
+				GEMINI_API_KEY: geminiSettings.apiKey,
+			},
+		};
+	}
+
+	// Custom agents - no API key injection
+	return baseConfig;
+}
+
+// ============================================================================
+// Initial State
+// ============================================================================
+
+/**
+ * Create initial session state.
+ */
+export function createInitialSession(
+	agentId: string,
+	agentDisplayName: string,
+	workingDirectory: string,
+): ChatSession {
+	return {
+		sessionId: null,
+		state: "disconnected",
+		agentId,
+		agentDisplayName,
+		authMethods: [],
+		availableCommands: undefined,
+		modes: undefined,
+		models: undefined,
+		createdAt: new Date(),
+		lastActivityAt: new Date(),
+		workingDirectory,
+	};
+}
+
+// ============================================================================
+// Gemini CLI Deprecation Notice
+// ============================================================================
+
+/** Docs URL for the Gemini CLI deprecation announcement. */
+export const GEMINI_DEPRECATION_DOCS_URL =
+	"https://rait-09.github.io/obsidian-agent-client/announcements/gemini-cli-deprecation.html";
+
+/**
+ * Build the in-app notice shown while the Gemini CLI agent is selected.
+ *
+ * Google is retiring Gemini CLI for account-login (Pro/Ultra/free) tiers on
+ * June 18, 2026. This notice is static (no network) and is driven purely by the
+ * active agent id, unlike the npm-registry-backed agent update check.
+ */
+export function buildGeminiDeprecationNotice(): AgentUpdateNotification {
+	return {
+		variant: "info",
+		title: "Gemini CLI is being discontinued",
+		message:
+			"Google is retiring account login for Gemini CLI (Pro/Ultra/free tiers) on June 18, 2026. " +
+			"Google states Gemini CLI stays accessible via a paid Gemini API key — see the guide for setup and privacy notes.",
+		link: { text: "Learn more", url: GEMINI_DEPRECATION_DOCS_URL },
+	};
+}

package/src/services/session-state.ts

@@ -0,0 +1,130 @@
+/**
+ * Pure functions for session state updates.
+ *
+ * These functions are extracted from useSession to keep the hook thin
+ * and to allow independent testing. They handle session config restoration
+ * and legacy mode/model management.
+ */
+
+import type {
+	ChatSession,
+	SessionConfigOption,
+	SessionResult,
+} from "../types/session";
+import { flattenConfigSelectOptions } from "../types/session";
+import type { AcpClient } from "../acp/acp-client";
+
+// ============================================================================
+// Legacy Config Helpers
+// ============================================================================
+
+/**
+ * Apply a legacy mode/model value to the session state.
+ * Used for both optimistic updates and rollbacks.
+ */
+export function applyLegacyValue(
+	prev: ChatSession,
+	kind: "mode" | "model",
+	value: string,
+): ChatSession {
+	if (kind === "mode") {
+		if (!prev.modes) return prev;
+		return { ...prev, modes: { ...prev.modes, currentModeId: value } };
+	}
+	if (!prev.models) return prev;
+	return { ...prev, models: { ...prev.models, currentModelId: value } };
+}
+
+// ============================================================================
+// Config Restore Helpers
+// ============================================================================
+
+/**
+ * Try to restore a saved config option value by category.
+ * Returns updated configOptions if restored, or the original if unchanged.
+ */
+export async function tryRestoreConfigOption(
+	agentClient: AcpClient,
+	sessionId: string,
+	configOptions: SessionConfigOption[],
+	category: string,
+	savedValue: string | undefined,
+): Promise<SessionConfigOption[]> {
+	if (!savedValue) return configOptions;
+
+	const option = configOptions.find((o) => o.category === category);
+	if (!option) return configOptions;
+	if (savedValue === option.currentValue) return configOptions;
+	if (
+		!flattenConfigSelectOptions(option.options).some(
+			(o) => o.value === savedValue,
+		)
+	)
+		return configOptions;
+
+	try {
+		return await agentClient.setSessionConfigOption(
+			sessionId,
+			option.id,
+			savedValue,
+		);
+	} catch {
+		return configOptions;
+	}
+}
+
+/**
+ * Restore last used mode/model via legacy APIs.
+ * Only called when configOptions is not available.
+ */
+export async function restoreLegacyConfig(
+	agentClient: AcpClient,
+	sessionResult: SessionResult,
+	savedModelId: string | undefined,
+	savedModeId: string | undefined,
+	setSession: (updater: (prev: ChatSession) => ChatSession) => void,
+): Promise<void> {
+	if (!sessionResult.sessionId) return;
+
+	// Legacy model restore
+	if (sessionResult.models && savedModelId) {
+		if (
+			savedModelId !== sessionResult.models.currentModelId &&
+			sessionResult.models.availableModels.some(
+				(m) => m.modelId === savedModelId,
+			)
+		) {
+			try {
+				await agentClient.setSessionModel(
+					sessionResult.sessionId,
+					savedModelId,
+				);
+				setSession((prev) =>
+					applyLegacyValue(prev, "model", savedModelId),
+				);
+			} catch {
+				// Agent default is fine as fallback
+			}
+		}
+	}
+
+	// Legacy mode restore
+	if (sessionResult.modes && savedModeId) {
+		if (
+			savedModeId !== sessionResult.modes.currentModeId &&
+			sessionResult.modes.availableModes.some((m) => m.id === savedModeId)
+		) {
+			try {
+				await agentClient.setSessionMode(
+					sessionResult.sessionId,
+					savedModeId,
+				);
+				setSession((prev) =>
+					applyLegacyValue(prev, "mode", savedModeId),
+				);
+			} catch {
+				// Agent default is fine as fallback
+			}
+		}
+	}
+}