@sayknow-cli/coding-agent 0.3.12 → 0.3.15

package/src/modes/types.ts

@@ -26,11 +26,15 @@ import type { EvalExecutionComponent } from "./components/eval-execution";
 import type { HookEditorComponent } from "./components/hook-editor";
 import type { HookInputComponent } from "./components/hook-input";
 import type { HookSelectorComponent } from "./components/hook-selector";
+import type { PetMode } from "./components/sayknow-pet-widget";
 import type { StatusLineComponent } from "./components/status-line";
 import type { ToolExecutionHandle } from "./components/tool-execution";
+import type { IrcObservationLedger } from "./irc-observation-ledger";
 import type { OAuthManualInputManager } from "./oauth-manual-input";
 import type { Theme } from "./theme/theme";
+import type { ParsedIrcMessage } from "./utils/irc-message";
 
+export type TranscriptRebuildPolicy = "replace-identity" | "reconcile-same-transcript";
 export type CompactionQueuedMessage = {
 	text: string;
 	mode: "steer" | "followUp";
@@ -60,6 +64,14 @@ export type TodoPhase = {
 	tasks: TodoItem[];
 };
 
+export type IrcArrivalSnapshot = Readonly<{
+	panelVisible: boolean;
+	/** User-requested open state; may be true while the panel yields at narrow widths. */
+	panelRequestedVisible: boolean;
+	sidebarAvailable: boolean;
+	resolvedToggleKey: string | null;
+}>;
+
 export interface InteractiveModeContext {
 	// UI access
 	ui: TUI;
@@ -84,6 +96,7 @@ export interface InteractiveModeContext {
 	mcpManager?: MCPManager;
 	lspServers?: LspStartupServerInfo[];
 
+	readonly ircLedger: IrcObservationLedger;
 	// State
 	isInitialized: boolean;
 	isBackgrounded: boolean;
@@ -163,6 +176,11 @@ export interface InteractiveModeContext {
 	setWorkingMessage(message?: string): void;
 	applyPendingWorkingMessage(): void;
 	ensureLoadingAnimation(): void;
+	setPetMode(mode: PetMode): void;
+	/** Live-preview a pet skin during a selector without persisting. */
+	previewPetMode(mode: PetMode): void;
+	/** Re-mount the composer (pet-aware) after an overlay/selector closes. */
+	restoreComposer(): void;
 	startPendingSubmission(input: {
 		text: string;
 		images?: ImageContent[];
@@ -187,21 +205,34 @@ export interface InteractiveModeContext {
 	withLocalSubmission<T>(text: string, fn: () => Promise<T>, options?: { imageCount?: number }): Promise<T>;
 	isKnownSlashCommand(text: string): boolean;
 	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): Component[];
+	addLiveIrcObservationToChat(message: ParsedIrcMessage, arrival: IrcArrivalSnapshot): Component[];
+	removeRenderedIrcInlineComponents(observationId: string): readonly Component[] | undefined;
+	resetRenderedIrcInlineComponents(): readonly (readonly Component[])[];
 	renderSessionContext(
 		sessionContext: SessionContext,
 		options?: { updateFooter?: boolean; populateHistory?: boolean },
 	): void;
-	renderInitialMessages(prebuiltContext?: SessionContext, options?: { preserveExistingChat?: boolean }): void;
+	rebuildInitialMessages(
+		policy: TranscriptRebuildPolicy,
+		prebuiltContext?: SessionContext,
+		options?: { preserveExistingChat?: boolean },
+	): void;
 	getUserMessageText(message: Message): string;
+	getAssistantViewportAnchorId?(message: AssistantMessage): string;
 	findLastAssistantMessage(): AssistantMessage | undefined;
 	extractAssistantText(message: AssistantMessage): string;
 	updateEditorTopBorder(): void;
 	updateEditorBorderColor(): void;
-	rebuildChatFromMessages(): void;
+	rebuildChatFromMessages(policy: TranscriptRebuildPolicy): void;
 	setTodos(todos: TodoItem[] | TodoPhase[]): void;
 	reloadTodos(): Promise<void>;
 	toggleTodoExpansion(): void;
 
+	// IRC sidebar
+	toggleIrcSidebar(): void;
+	captureIrcArrivalSnapshot(): IrcArrivalSnapshot;
+	applyIrcSidebarAvailability(enabled: boolean): void;
+	resetIrcSidebarSession(): void;
 	// Command handling
 	handleExportCommand(text: string): Promise<void>;
 	handleShareCommand(): Promise<void>;
@@ -242,6 +273,7 @@ export interface InteractiveModeContext {
 	// Selector handling
 	showSettingsSelector(): void;
 	showThemeSelector(): void;
+	showPetSelector(): void;
 	showHistorySearch(): void;
 	showExtensionsDashboard(): void;
 	showAgentsDashboard(): void;

package/src/modes/utils/context-usage.ts

@@ -3,16 +3,20 @@ import type { CompactionSettings } from "@sayknow-cli/agent-core/compaction";
 import {
 	effectiveReserveTokens,
 	estimateMessageTokensHeuristic,
-	estimateTextTokensHeuristic,
 	resolveThresholdTokens,
 } from "@sayknow-cli/agent-core/compaction";
 import type { Model } from "@sayknow-cli/ai";
 import { formatNumber } from "@sayknow-cli/utils";
-import type { Skill } from "../../extensibility/skills";
 import type { AgentSession } from "../../session/agent-session";
-import type { Tool } from "../../tools";
+import { computeNonMessageBreakdown } from "../../session/context-estimation";
 import type { theme as Theme } from "../theme/theme";
 
+export {
+	computeNonMessageTokens,
+	estimateSkillsTokens,
+	estimateToolSchemaTokens,
+} from "../../session/context-estimation";
+
 const GRID_COLS = 20;
 const GRID_ROWS = 10;
 const GRID_CELLS = GRID_COLS * GRID_ROWS;
@@ -38,90 +42,13 @@ export interface ContextBreakdown {
 	contextWindow: number;
 	categories: CategoryInfo[];
 	lastUserTurnTokens: number;
-	usedTokens: number;
+	estimatedCategoryTotal: number;
+	usedTokens: number | null;
+	source: "provider_anchor" | "heuristic" | "unknown";
 	autoCompactBufferTokens: number;
 	freeTokens: number;
 }
 
-export function estimateSkillsTokens(skills: readonly Skill[]): number {
-	const fragments: string[] = [];
-	for (const skill of skills) {
-		// "- name: description\n" wire framing tokenizes ~identically to the
-		// concatenated form, so encode each piece separately and sum.
-		fragments.push(skill.name, skill.description);
-	}
-	return estimateTextTokensHeuristic(fragments);
-}
-
-export function estimateToolSchemaTokens(
-	tools: ReadonlyArray<Pick<Tool, "name" | "description" | "parameters">>,
-): number {
-	const fragments: string[] = [];
-	for (const tool of tools) {
-		fragments.push(tool.name, tool.description);
-		try {
-			fragments.push(JSON.stringify(tool.parameters ?? {}));
-		} catch {
-			// Schema may contain functions or cycles; ignore.
-		}
-	}
-	return estimateTextTokensHeuristic(fragments);
-}
-
-/**
- * Compute just the NON-MESSAGE token total: system prompt (with its skills
- * section subtracted, since skills are tokenized separately) + system context
- * (the rest of the system-prompt array) + tools + skills.
- *
- * Exposed so callers like `StatusLineComponent` can cache the non-message
- * total separately from the message total. Non-message inputs (skills,
- * tools, system prompt) change rarely; the message list grows on every
- * streaming turn. Splitting the two lets the caller refresh each on its own
- * cadence — non-message recomputed only when the inputs identity changes,
- * messages walked incrementally as new entries append.
- */
-export function computeNonMessageTokens(session: AgentSession): number {
-	const parts = computeNonMessageBreakdown(session);
-	return (
-		parts.systemPromptTokens + parts.systemContextTokens + parts.rulesTokens + parts.toolsTokens + parts.skillsTokens
-	);
-}
-
-/**
- * Shared helper for the four non-message token totals. Single source of truth
- * for both `computeNonMessageTokens` (status-line incremental cache) and
- * `computeContextBreakdown` (/context panel). The split avoids drift between
- * the two surfaces — they MUST report the same numbers.
- */
-function computeNonMessageBreakdown(session: AgentSession): {
-	rulesTokens: number;
-	skillsTokens: number;
-	toolsTokens: number;
-	systemContextTokens: number;
-	systemPromptTokens: number;
-} {
-	const skillsTokens = estimateSkillsTokens(session.skills ?? []);
-	const toolsTokens = estimateToolSchemaTokens(session.agent?.state?.tools ?? []);
-	const systemPromptParts = session.systemPrompt ?? [];
-	const rulesTokens = estimateRulesTokens(systemPromptParts);
-	const systemContextTokens = estimateTextTokensHeuristic(systemPromptParts.slice(1));
-	const systemPromptTokens = Math.max(
-		0,
-		estimateTextTokensHeuristic(systemPromptParts[0] ?? "") - skillsTokens - rulesTokens,
-	);
-	return { rulesTokens, skillsTokens, toolsTokens, systemContextTokens, systemPromptTokens };
-}
-
-function estimateRulesTokens(systemPromptParts: readonly string[]): number {
-	const fragments: string[] = [];
-	for (const part of systemPromptParts) {
-		for (const match of part.matchAll(/<rules>[\s\S]*?<\/rules>/g)) {
-			fragments.push(match[0]);
-		}
-	}
-	return fragments.length === 0 ? 0 : estimateTextTokensHeuristic(fragments);
-}
-
 function splitLastUserTurn(messages: readonly AgentMessage[]): {
 	regularMessagesTokens: number;
 	lastUserTurnTokens: number;
@@ -198,7 +125,11 @@ export function computeContextBreakdown(
 		},
 	];
 
-	const usedTokens = categories.reduce((sum, c) => sum + c.tokens, 0);
+	const estimatedCategoryTotal = categories.reduce((sum, c) => sum + c.tokens, 0);
+	const contextUsage = session.getContextUsage?.();
+	const source = contextUsage?.source ?? "heuristic";
+	const usedTokens = source === "unknown" ? null : (contextUsage?.tokens ?? estimatedCategoryTotal);
+	const tokensForFreeSpace = usedTokens ?? estimatedCategoryTotal;
 
 	let autoCompactBufferTokens = 0;
 	if (contextWindow > 0) {
@@ -214,16 +145,18 @@ export function computeContextBreakdown(
 			autoCompactBufferTokens = effectiveReserveTokens(contextWindow, compactionSettings);
 		}
 	}
-	autoCompactBufferTokens = Math.min(autoCompactBufferTokens, Math.max(0, contextWindow - usedTokens));
+	autoCompactBufferTokens = Math.min(autoCompactBufferTokens, Math.max(0, contextWindow - tokensForFreeSpace));
 
-	const freeTokens = Math.max(0, contextWindow - usedTokens - autoCompactBufferTokens);
+	const freeTokens = Math.max(0, contextWindow - tokensForFreeSpace - autoCompactBufferTokens);
 
 	return {
 		model,
 		contextWindow,
 		categories,
 		lastUserTurnTokens,
+		estimatedCategoryTotal,
 		usedTokens,
+		source,
 		autoCompactBufferTokens,
 		freeTokens,
 	};
@@ -310,18 +243,48 @@ function percentString(part: number, whole: number, fractionDigits = 1): string
 
 function buildLegendLines(breakdown: ContextBreakdown, theme: typeof Theme): string[] {
 	const lines: string[] = [];
-	const { model, contextWindow, categories, usedTokens, autoCompactBufferTokens, freeTokens } = breakdown;
+	const {
+		model,
+		contextWindow,
+		categories,
+		estimatedCategoryTotal,
+		usedTokens,
+		source,
+		autoCompactBufferTokens,
+		freeTokens,
+	} = breakdown;
 
 	const modelName = model?.name ?? model?.id ?? "no model";
 	const modelId = model?.id ?? "unknown";
 	const windowLabel = formatNumber(contextWindow).toLowerCase();
+	const totalSourceLabel =
+		source === "provider_anchor"
+			? "provider-reported"
+			: source === "unknown"
+				? "estimated; exact count unknown until next response"
+				: "estimated";
 
 	lines.push(theme.bold(`${modelName}`) + theme.fg("dim", ` (${windowLabel} context)`));
 	lines.push(theme.fg("muted", `${modelId}[${windowLabel}]`));
-	lines.push(
-		`${theme.bold(formatNumber(usedTokens))}${theme.fg("dim", `/${windowLabel} tokens`)}` +
-			theme.fg("muted", ` (${percentString(usedTokens, contextWindow)})`),
-	);
+	if (usedTokens === null) {
+		lines.push(
+			`${theme.bold("unknown")}${theme.fg("dim", `/${windowLabel} tokens`)}` +
+				theme.fg("muted", " (exact count unknown until next response)"),
+		);
+	} else {
+		lines.push(
+			`${theme.bold(formatNumber(usedTokens))}${theme.fg("dim", `/${windowLabel} tokens`)}` +
+				theme.fg("muted", ` (${percentString(usedTokens, contextWindow)}) (${totalSourceLabel})`),
+		);
+	}
+	if (source !== "unknown" && usedTokens !== null && estimatedCategoryTotal !== usedTokens) {
+		lines.push(
+			theme.fg(
+				"muted",
+				`Estimated category total: ${formatNumber(estimatedCategoryTotal)} tokens (composition below is estimated)`,
+			),
+		);
+	}
 	lines.push("");
 	lines.push(theme.fg("muted", "Estimated usage by category"));
 
@@ -334,8 +297,9 @@ function buildLegendLines(breakdown: ContextBreakdown, theme: typeof Theme): str
 	}
 
 	const freeDot = theme.fg("dim", CELL_FREE);
+	const freeLabel = usedTokens === null ? "Free space (estimated)" : "Free space";
 	lines.push(
-		`${freeDot} Free space: ${theme.bold(formatNumber(freeTokens))} ${theme.fg("dim", `(${percentString(freeTokens, contextWindow)})`)}`,
+		`${freeDot} ${freeLabel}: ${theme.bold(formatNumber(freeTokens))} ${theme.fg("dim", `(${percentString(freeTokens, contextWindow)})`)}`,
 	);
 
 	if (autoCompactBufferTokens > 0) {

package/src/modes/utils/hotkeys-markdown.ts

@@ -54,6 +54,7 @@ export function buildHotkeysMarkdown(bindings: HotkeysMarkdownBindings): string
 		`| \`${appKey(bindings, "app.editor.external")}\` | Edit message in external editor |`,
 		`| \`${appKey(bindings, "app.clipboard.pasteImage")}\` | Paste image from clipboard |`,
 		`| \`${appKey(bindings, "app.stt.toggle")}\` | Toggle speech-to-text recording |`,
+		`| \`${appKey(bindings, "app.irc.sidebar.toggle")}\` | Toggle IRC sidebar |`,
 		"| `?` | Show help / shortcuts |",
 		"| `#` | Prompt actions (command-palette style actions) |",
 		"| `/` | Slash commands (try `/help` or `/new`) |",

package/src/modes/utils/irc-message.ts

@@ -0,0 +1,138 @@
+import * as crypto from "node:crypto";
+import type { AgentMessage } from "@sayknow-cli/agent-core";
+import { getSegmenter } from "@sayknow-cli/tui";
+import { sanitizeText } from "@sayknow-cli/utils";
+import { associateSessionMessageObservationId, getSessionMessageObservationId } from "../../session/session-manager";
+
+const graphemeSegmenter = getSegmenter();
+const IRC_IDENTITY_SOURCE_MAX_UTF8_BYTES = 4 * 1_024;
+const IRC_IDENTITY_DISPLAY_MAX_UTF8_BYTES = 256;
+export type IrcMessageKind = "incoming" | "autoreply" | "relay";
+
+export type ParsedIrcMessage = {
+	observationId: string;
+	from: string;
+	to: string;
+	text: string;
+	timestamp: number;
+	kind: IrcMessageKind;
+};
+
+export interface IrcMessageBlock {
+	readonly sender: string;
+	readonly recipient: string;
+	readonly kind: "incoming" | "autoreply" | "outgoing";
+	readonly time: string;
+	readonly bodyLines: readonly string[];
+}
+
+export function projectIrcText(
+	text: string,
+	maxUtf8Bytes: number,
+): { text: string; truncated: boolean; utf8Bytes: number } {
+	let end = 0;
+	let utf8Bytes = 0;
+	for (const part of graphemeSegmenter.segment(text)) {
+		const segmentBytes = Buffer.byteLength(part.segment, "utf8");
+		if (utf8Bytes + segmentBytes > maxUtf8Bytes) break;
+		utf8Bytes += segmentBytes;
+		end = part.index + part.segment.length;
+	}
+	return { text: text.slice(0, end), truncated: end < text.length, utf8Bytes };
+}
+
+/** Normalizes and bounds untrusted IRC identity fields without splitting visible graphemes. */
+export function normalizeIrcIdentity(identity: string): string {
+	const source = projectIrcText(identity, IRC_IDENTITY_SOURCE_MAX_UTF8_BYTES);
+	const sanitized = sanitizeText(source.text.replace(/[\r\n\t\u2028\u2029]+/g, " ")).replace(
+		/[\u061C\u200E-\u200F\u202A-\u202E\u2066-\u2069]/g,
+		"",
+	);
+	const display = projectIrcText(sanitized, IRC_IDENTITY_DISPLAY_MAX_UTF8_BYTES);
+	return source.truncated || display.truncated ? `${display.text}…` : display.text;
+}
+
+/** Formats IRC observations into display-neutral semantic blocks for both IRC surfaces. */
+export function formatIrcMessageBlock(message: ParsedIrcMessage & { timestamp: number }): IrcMessageBlock {
+	const date = new Date(message.timestamp);
+	// IRC timestamps are human-facing, so use local time rather than UTC serialization.
+	const time = Number.isFinite(date.getTime())
+		? `${String(date.getHours()).padStart(2, "0")}:${String(date.getMinutes()).padStart(2, "0")}`
+		: "--:--";
+	const bodyLines = message.text === "" ? [] : message.text.replaceAll("\t", "    ").split("\n");
+	return {
+		sender: normalizeIrcIdentity(message.from),
+		recipient: normalizeIrcIdentity(message.to),
+		kind: message.kind === "relay" ? "outgoing" : message.kind,
+		time,
+		bodyLines,
+	};
+}
+
+type IrcCustomMessage = Extract<AgentMessage, { role: "custom" }>;
+
+export function isIrcCustomType(customType: string | undefined): customType is `irc:${IrcMessageKind}` {
+	return customType === "irc:incoming" || customType === "irc:autoreply" || customType === "irc:relay";
+}
+
+function stringDetail(details: unknown, key: string): string {
+	if (!details || typeof details !== "object") return "";
+	const value = (details as Record<string, unknown>)[key];
+	return typeof value === "string" ? value : "";
+}
+
+function legacyObservationId(fields: readonly string[]): string {
+	const hash = crypto.createHash("sha256");
+	hash.update("skc:irc:legacy-observation:v1\0");
+	for (const field of fields) {
+		hash.update(String(Buffer.byteLength(field, "utf8")));
+		hash.update(":");
+		hash.update(field);
+	}
+	return `legacy:sha256:${hash.digest("hex")}`;
+}
+
+/**
+ * Normalizes every supported IRC custom message into its UI observation shape.
+ * Legacy records have no UUID, so their immutable payload is used as a stable key.
+ */
+export function parseIrcMessage(message: IrcCustomMessage): ParsedIrcMessage | undefined {
+	if (!isIrcCustomType(message.customType)) return undefined;
+
+	const kind = message.customType.slice(4) as IrcMessageKind;
+	const sourceTimestamp =
+		typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : undefined;
+	const timestamp = sourceTimestamp ?? Date.now();
+	const rawFrom = kind === "autoreply" ? "you" : stringDetail(message.details, "from") || "?";
+	const rawTo = kind === "incoming" ? "you" : stringDetail(message.details, "to") || "?";
+	const rawText =
+		kind === "incoming"
+			? stringDetail(message.details, "message")
+			: kind === "autoreply"
+				? stringDetail(message.details, "reply")
+				: stringDetail(message.details, "body");
+	const from = normalizeIrcIdentity(rawFrom);
+	const to = normalizeIrcIdentity(rawTo);
+	const text = sanitizeText(rawText);
+	const explicitObservationId = stringDetail(message.details, "observationId");
+	const observationId = associateSessionMessageObservationId(
+		message,
+		explicitObservationId ||
+			getSessionMessageObservationId(message) ||
+			legacyObservationId([
+				kind,
+				sourceTimestamp === undefined ? "null" : String(sourceTimestamp),
+				rawFrom,
+				rawTo,
+				rawText,
+			]),
+	);
+	return {
+		observationId,
+		from,
+		to,
+		text,
+		timestamp,
+		kind,
+	};
+}