@sayknow-cli/coding-agent 0.3.12 → 0.3.15

package/src/tools/index.ts

@@ -122,16 +122,91 @@ export type {
 	DiscoverableToolSource,
 } from "../tool-discovery/tool-index";
 
+/** A typed remote action available to an ask answer source. */
+export type AskRemoteControlId = "navigation_forward";
+
+export interface AskRemoteControl {
+	id: AskRemoteControlId;
+	kind: "navigation";
+	label: "Next" | "Done";
+	enabled: boolean;
+}
+
+export interface AskAnswerRequest {
+	question: string;
+	options: string[];
+	interaction: "selector" | "custom_editor" | "clarification_editor";
+	controls: readonly AskRemoteControl[];
+}
+
+export type AskRemoteInteraction =
+	| { kind: "value"; value: string }
+	| { kind: "control"; controlId: AskRemoteControlId };
+
+export type AskSettlement =
+	| { kind: "commit" }
+	| {
+			kind: "resolve_without_commit";
+			reason:
+				| "toggle"
+				| "other_transition"
+				| "clarification_transition"
+				| "clarification_submitted"
+				| "empty_navigation"
+				| "back_navigation"
+				| "cancelled"
+				| "aborted"
+				| "timed_out"
+				| "exception"
+				| "shutdown";
+	  }
+	| {
+			kind: "invalid";
+			reason:
+				| "invalid_option"
+				| "invalid_control"
+				| "invalid_structured_answer"
+				| "empty_custom"
+				| "empty_clarification";
+	  };
+
+export type AskSelectedAckOutcome =
+	| { status: "delivered"; messageId: number }
+	| {
+			status: "failed";
+			reason:
+				| "unsupported"
+				| "no_participant"
+				| "ambiguous_participant"
+				| "route_missing"
+				| "expired"
+				| "cancelled"
+				| "telegram_rejected"
+				| "session_closed";
+	  }
+	| { status: "unknown"; reason: "transport_ambiguous" | "origin_disconnected" | "host_timeout" | "shutdown" };
+
+export type AskSettlementResult =
+	| { kind: "committed"; ack: AskSelectedAckOutcome }
+	| { kind: "resolved_without_commit" }
+	| { kind: "invalid_closed" };
+
+export interface AskRemoteReceipt {
+	source: "remote";
+	interaction: AskRemoteInteraction;
+	settle(value: AskSettlement): Promise<AskSettlementResult>;
+}
+
+export type AskAnswerSourceResult = AskRemoteReceipt | string | undefined;
+
 /**
- * Source of remote answers for interactive asks (e.g. a Telegram reply routed
- * through the notifications SDK). Lets a pending ask resolve without RPC mode.
+ * Source of remote answers. `awaitAnswer` remains the legacy wire for existing
+ * integrations; typed sources opt into `awaitAnswerRequest`. This keeps an old
+ * string-only source from accidentally acquiring acknowledgement authority.
  */
 export interface AskAnswerSource {
-	/**
-	 * Race a remote answer against the local UI for one question. Resolves with the
-	 * chosen option label or free-text answer, or `undefined` to defer to local UI.
-	 */
 	awaitAnswer(question: string, options: string[], signal?: AbortSignal): Promise<string | undefined>;
+	awaitAnswerRequest?(request: AskAnswerRequest, signal?: AbortSignal): Promise<AskAnswerSourceResult>;
 }
 
 /** Session context for tool factories */

package/src/tools/sqlite-reader.ts

@@ -150,13 +150,16 @@ function buildAsciiTable(columns: string[], rows: SqliteRow[]): string {
 	return lines.map(line => truncateToWidth(replaceTabs(line), MAX_RENDER_WIDTH)).join("\n");
 }
 
+const DECIMAL_INTEGER_PATTERN = /^[+-]?\d+$/;
+
 function parseLimit(value: string | null, fallback: number): number {
 	if (value === null || value.trim().length === 0) {
 		return fallback;
 	}
 
-	const parsed = Number.parseInt(value, 10);
-	if (!Number.isFinite(parsed) || parsed < 1) {
+	const normalizedValue = value.trim();
+	const parsed = Number(normalizedValue);
+	if (!DECIMAL_INTEGER_PATTERN.test(normalizedValue) || !Number.isFinite(parsed) || parsed < 1) {
 		throw new ToolError(`SQLite limit must be a positive integer; got '${value}'`);
 	}
 	return Math.min(parsed, MAX_QUERY_LIMIT);
@@ -167,8 +170,9 @@ function parseOffset(value: string | null): number {
 		return 0;
 	}
 
-	const parsed = Number.parseInt(value, 10);
-	if (!Number.isFinite(parsed) || parsed < 0) {
+	const normalizedValue = value.trim();
+	const parsed = Number(normalizedValue);
+	if (!DECIMAL_INTEGER_PATTERN.test(normalizedValue) || !Number.isFinite(parsed) || parsed < 0) {
 		throw new ToolError(`SQLite offset must be a non-negative integer; got '${value}'`);
 	}
 	return parsed;

package/src/tui/output-block.ts

@@ -1,9 +1,16 @@
 /**
  * Bordered output container with optional header and sections.
  */
-import { ImageProtocol, padding, TERMINAL, visibleWidth, wrapTextWithAnsi } from "@sayknow-cli/tui";
+import {
+	ImageProtocol,
+	isTerminalGraphicsFallbackActive,
+	padding,
+	TERMINAL,
+	visibleWidth,
+	wrapTextWithAnsi,
+} from "@sayknow-cli/tui";
 import type { Theme } from "../modes/theme/theme";
-import { getSixelLineMask } from "../utils/sixel";
+import { containsSixelSequence, getSixelLineMask } from "../utils/sixel";
 import type { State } from "./types";
 import type { RenderCache } from "./utils";
 import { getStateBgColor, Hasher, padToWidth, truncateToWidth } from "./utils";
@@ -81,13 +88,17 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 			);
 		}
 		const allLines = section.lines.flatMap(l => l.split("\n"));
-		const sixelLineMask = TERMINAL.imageProtocol === ImageProtocol.Sixel ? getSixelLineMask(allLines) : undefined;
+		const fallbackActive = isTerminalGraphicsFallbackActive();
+		const sixelLineMask =
+			fallbackActive || TERMINAL.imageProtocol === ImageProtocol.Sixel ? getSixelLineMask(allLines) : undefined;
 		for (let lineIndex = 0; lineIndex < allLines.length; lineIndex++) {
-			const line = allLines[lineIndex]!;
-			if (sixelLineMask?.[lineIndex]) {
-				lines.push(line);
+			const sixelLine = sixelLineMask?.[lineIndex] ?? false;
+			if (sixelLine && !fallbackActive) {
+				lines.push(allLines[lineIndex]!);
 				continue;
 			}
+			if (sixelLine && sixelLineMask?.[lineIndex - 1] && !containsSixelSequence(allLines[lineIndex]!)) continue;
+			const line = sixelLine ? "[SIXEL image hidden while IRC sidebar is visible]" : allLines[lineIndex]!;
 			const wrappedLines = wrapTextWithAnsi(line.trimEnd(), contentWidth);
 			for (const wrappedLine of wrappedLines) {
 				const innerPadding = padding(Math.max(0, contentWidth - visibleWidth(wrappedLine)));
@@ -137,6 +148,7 @@ export class CachedOutputBlock {
 		h.optional(options.headerMeta);
 		h.optional(options.state);
 		h.bool(options.applyBg ?? true);
+		h.bool(isTerminalGraphicsFallbackActive());
 		if (options.sections) {
 			for (const s of options.sections) {
 				h.optional(s.label);

package/src/utils/external-editor.ts

@@ -21,6 +21,11 @@ export interface OpenInEditorOptions {
 	trimTrailingNewline?: boolean;
 }
 
+/** Remove one platform-standard trailing line terminator from editor content. */
+export function trimEditorTrailingNewline(text: string): string {
+	return text.replace(/\r?\n$/, "");
+}
+
 /**
  * Opens `content` in the user's external editor and returns the edited text.
  * Returns `null` if the editor exits with a non-zero code.
@@ -52,7 +57,7 @@ export async function openInEditor(
 			if (options?.trimTrailingNewline === false) {
 				return text;
 			}
-			return text.replace(/\n$/, "");
+			return trimEditorTrailingNewline(text);
 		}
 		return null;
 	} finally {