@gajae-code/coding-agent 0.4.1 → 0.4.3

package/src/tools/image-gen.ts

@@ -401,23 +401,39 @@ export function setPreferredImageProvider(provider: ImageProvider | "auto"): voi
 
 interface ParsedAntigravityCredentials {
 	accessToken: string;
-	projectId: string;
+	projectId?: string;
 }
 
 function parseAntigravityCredentials(raw: string): ParsedAntigravityCredentials | null {
 	try {
-		const parsed = JSON.parse(raw) as { token?: string; projectId?: string };
-		if (parsed.token && parsed.projectId) {
-			return { accessToken: parsed.token, projectId: parsed.projectId };
+		const parsed = JSON.parse(raw) as { token?: string; accessToken?: string; projectId?: string };
+		const token = parsed.token ?? parsed.accessToken;
+		if (typeof token === "string" && token.trim().length > 0) {
+			return { accessToken: token.trim(), projectId: parsed.projectId };
 		}
+		// Parsed as JSON but no usable token field.
+		return null;
 	} catch {
-		// Invalid JSON
+		// Not JSON: treat the value as a raw bearer token.
 	}
-	return null;
+	const rawToken = raw.trim();
+	return rawToken.length > 0 ? { accessToken: rawToken } : null;
 }
 
-async function findAntigravityCredentials(modelRegistry: ModelRegistry): Promise<ImageApiKey | null> {
-	const apiKey = await modelRegistry.getApiKeyForProvider("google-antigravity");
+async function findAntigravityCredentials(
+	modelRegistry: ModelRegistry,
+	sessionId?: string,
+): Promise<ImageApiKey | null> {
+	const oauthAccess = await modelRegistry.authStorage.getOAuthAccess("google-antigravity", sessionId);
+	if (oauthAccess?.accessToken) {
+		return {
+			provider: "antigravity",
+			apiKey: oauthAccess.accessToken,
+			projectId: oauthAccess.projectId,
+		};
+	}
+
+	const apiKey = await modelRegistry.getApiKeyForProvider("google-antigravity", sessionId);
 	if (!apiKey) return null;
 
 	const parsed = parseAntigravityCredentials(apiKey);
@@ -457,7 +473,7 @@ async function findImageApiKey(
 		if (openAI) return openAI;
 		// Fall through to auto-detect if preferred provider key not found.
 	} else if (preferredImageProvider === "antigravity" && modelRegistry) {
-		const antigravity = await findAntigravityCredentials(modelRegistry);
+		const antigravity = await findAntigravityCredentials(modelRegistry, sessionId);
 		if (antigravity) return antigravity;
 		// Fall through to auto-detect if preferred provider key not found.
 	} else if (preferredImageProvider === "gemini") {
@@ -477,7 +493,7 @@ async function findImageApiKey(
 	if (openAI) return openAI;
 
 	if (modelRegistry) {
-		const antigravity = await findAntigravityCredentials(modelRegistry);
+		const antigravity = await findAntigravityCredentials(modelRegistry, sessionId);
 		if (antigravity) return antigravity;
 	}
 
@@ -589,12 +605,21 @@ function collectInlineImages(parts: GeminiPart[]): InlineImageData[] {
 	return images;
 }
 
-function isOpenAIHostedImageModel(model: Model | undefined): model is Model {
+export function isOpenAIHostedImageModel(model: Model | undefined): model is Model {
 	if (!model) return false;
-	if (model.provider !== "openai" && model.provider !== "openai-codex") return false;
+	// The hosted image_generation tool is only available over the Responses API.
 	if (model.api !== "openai-responses" && model.api !== "openai-codex-responses") return false;
-	const modelId = model.id.toLowerCase();
-	return modelId.startsWith("gpt-") || modelId === "o3" || modelId.startsWith("o3-");
+	// Declarative capability: any provider (e.g. an OpenAI-compatible proxy
+	// fronting gpt-image) whose model advertises image output can drive
+	// generate_image, routed to the model's own baseUrl with registry auth.
+	if (model.output?.includes("image")) return true;
+	// First-party heuristic: OpenAI/OpenAI code GPT and o3 models generate
+	// images inline through the hosted tool without a declared output modality.
+	if (model.provider === "openai" || model.provider === "openai-codex") {
+		const modelId = model.id.toLowerCase();
+		return modelId.startsWith("gpt-") || modelId === "o3" || modelId.startsWith("o3-");
+	}
+	return false;
 }
 
 function getOpenAIHostedImageProvider(model: Model): ImageProvider {
@@ -995,7 +1020,9 @@ export const imageGenTool: CustomTool<typeof imageGenSchema, ImageGenToolDetails
 
 			if (provider === "antigravity") {
 				if (!apiKey.projectId) {
-					throw new Error("Missing projectId in antigravity credentials");
+					throw new Error(
+						"Antigravity image generation requires a projectId, but the stored google-antigravity credential only contains an access token. Run the google-antigravity login flow again so the projectId is stored, then retry.",
+					);
 				}
 
 				const prompt = assemblePrompt(params);

package/src/tools/index.ts

@@ -13,7 +13,11 @@ import { LspTool } from "../lsp";
 import type { WorkflowGateEmitter } from "../modes/shared/agent-wire/unattended-session";
 import type { PlanModeState } from "../plan-mode/state";
 import type { AgentRegistry } from "../registry/agent-registry";
-import type { ForkContextSeed, ForkContextSeedOptions } from "../session/agent-session";
+import type {
+	ForkContextSeed,
+	ForkContextSeedOptions,
+	PurgeQueuedCustomMessagesResult,
+} from "../session/agent-session";
 import type { ArtifactManager } from "../session/artifacts";
 import type { ClientBridge } from "../session/client-bridge";
 import type { CustomMessage } from "../session/messages";
@@ -162,6 +166,8 @@ export interface ToolSession {
 	/** Agent identity used for IRC routing. Returns the registry id (e.g. "0-Main", "0-AuthLoader"). */
 	getAgentId?: () => string | null;
 	/** Look up a registered tool by name (used by the eval js backend's tool bridge). */
+	/** Purge undelivered queued custom messages matching the predicate. Returns counts. */
+	purgeQueuedCustomMessages?: (predicate: (message: CustomMessage) => boolean) => PurgeQueuedCustomMessagesResult;
 	getToolByName?: (name: string) => AgentTool | undefined;
 	/** Agent registry for IRC routing across live sessions. */
 	agentRegistry?: AgentRegistry;

package/src/tools/inspect-image.ts

@@ -78,19 +78,21 @@ export class InspectImageTool implements AgentTool<typeof inspectImageSchema, In
 		};
 
 		const activeModelPattern = this.session.getActiveModelString?.() ?? this.session.getModelString?.();
-		const model =
-			resolvePattern("pi/vision") ??
-			resolvePattern("pi/default") ??
-			resolvePattern(activeModelPattern) ??
-			availableModels[0];
+		let model = resolvePattern("pi/default") ?? resolvePattern(activeModelPattern) ?? availableModels[0];
 		if (!model) {
 			throw new ToolError("Unable to resolve a model for inspect_image.");
 		}
 
+		// inspect_image requires image input; if the resolved model is text-only,
+		// fall back to any available vision-capable model before failing.
 		if (!model.input.includes("image")) {
-			throw new ToolError(
-				`Resolved model ${model.provider}/${model.id} does not support image input. Configure a vision-capable model for modelRoles.vision.`,
-			);
+			const visionModel = availableModels.find(candidate => candidate.input.includes("image"));
+			if (!visionModel) {
+				throw new ToolError(
+					`Resolved model ${model.provider}/${model.id} does not support image input, and no vision-capable model is available. Configure a vision-capable model.`,
+				);
+			}
+			model = visionModel;
 		}
 
 		const apiKey = await modelRegistry.getApiKey(model);

package/src/tools/job.ts

@@ -52,7 +52,7 @@ interface JobSnapshot {
 	errorText?: string;
 }
 
-type CancelStatus = "cancelled" | "not_found" | "already_completed";
+type CancelStatus = "cancelled" | "not_found" | "already_completed" | "already_cancelled";
 
 interface CancelOutcome {
 	id: string;
@@ -115,10 +115,20 @@ export class JobTool implements AgentTool<typeof jobSchema, JobToolDetails> {
 		for (const id of cancelIds) {
 			const existing = manager.getJob(id);
 			if (!existing || (ownerId && existing.ownerId !== ownerId)) {
-				cancelOutcomes.push({ id, status: "not_found", message: `Background job not found: ${id}` });
+				const tombstone = manager.purgeMonitorTombstone(id, ownerFilter);
+				cancelOutcomes.push(
+					tombstone.found
+						? {
+								id,
+								status: tombstone.status === "cancelled" ? "already_cancelled" : "already_completed",
+								message: `Monitor job ${id} already gone; purged queued notifications.`,
+							}
+						: { id, status: "not_found", message: `Background job not found: ${id}` },
+				);
 				continue;
 			}
 			if (existing.status !== "running") {
+				if (existing.metadata?.monitor) manager.purgeMonitorTombstone(id, ownerFilter);
 				cancelOutcomes.push({
 					id,
 					status: "already_completed",

package/src/tools/monitor.ts

@@ -47,6 +47,7 @@ export interface MonitorToolDetails {
 }
 
 const MONITOR_LABEL_MAX = 120;
+const MAX_PENDING_MONITOR_NOTIFICATIONS = 3;
 
 function buildMonitorLabel(params: MonitorParams): string {
 	const base = `[monitor:${params.kind}] ${params.description}`;
@@ -89,36 +90,116 @@ export class MonitorTool implements AgentTool<typeof monitorSchema, MonitorToolD
 		const ownerId = this.session.getAgentId?.() ?? undefined;
 		const bash = new BashTool(this.session);
 		let deliveredFirstLine = false;
+		const controller = { closed: false };
+		let currentJobId = "";
+		let sequence = 0;
+		let latestLine: string | undefined;
+		let coalescedCount = 0;
+		let flushScheduled = false;
+		// Count of notification *sends* (not live queue depth): once it exceeds the
+		// cap, each new send first purges older queued notifications for this task,
+		// keeping the queue bounded and latest-biased.
+		let pendingNotifications = 0;
+		const isMonitorMessage = (message: { customType?: string; details?: unknown }) =>
+			message.customType === "task-notification" &&
+			(message.details as { taskId?: string } | undefined)?.taskId === currentJobId;
+		const flushLatest = () => {
+			if (!persistent || latestLine === undefined) return;
+			const line = latestLine;
+			const count = coalescedCount;
+			latestLine = undefined;
+			coalescedCount = 0;
+			flushScheduled = false;
+			sendNotification(line, currentJobId, count);
+		};
+		const closeMonitor = (mode: "purge" | "flush") => {
+			// "flush" (natural process exit): deliver the newest pending line so the
+			// final state is never lost, then stop. "purge" (explicit cancel / registry
+			// eviction): drop the queued backlog. Non-persistent monitors keep their one
+			// notification, so they never purge.
+			if (mode === "flush") {
+				flushLatest();
+				controller.closed = true;
+				return;
+			}
+			controller.closed = true;
+			if (!persistent) return;
+			return this.session.purgeQueuedCustomMessages?.(isMonitorMessage);
+		};
+		const sendNotification = (line: string, jobId: string, count: number) => {
+			if (controller.closed) return;
+			const notificationId = `${jobId}:${sequence}`;
+			const suffix = count > 0 ? `\n(+${count} earlier lines)` : "";
+			const content = `<task-notification>\nMonitor task ${jobId} (${params.kind}: ${params.description}) emitted latest state:\n${line}${suffix}\n</task-notification>`;
+			const details = {
+				taskId: jobId,
+				kind: params.kind,
+				description: params.description,
+				monitor: true,
+				notificationId,
+				sequence,
+				coalescedCount: count,
+			};
+			pendingNotifications += 1;
+			if (pendingNotifications > MAX_PENDING_MONITOR_NOTIFICATIONS) {
+				this.session.purgeQueuedCustomMessages?.(
+					m =>
+						m.customType === "task-notification" &&
+						(m.details as { taskId?: string; notificationId?: string } | undefined)?.taskId === jobId &&
+						(m.details as { notificationId?: string } | undefined)?.notificationId !== notificationId,
+				);
+				pendingNotifications = MAX_PENDING_MONITOR_NOTIFICATIONS;
+			}
+			const sendPromise = this.session.sendCustomMessage?.(
+				{ customType: "task-notification", content, display: false, attribution: "agent", details },
+				{ triggerTurn: true, deliverAs: "followUp" },
+			);
+			if (sendPromise) {
+				void sendPromise.catch(error => {
+					logger.warn("Monitor task-notification delivery failed", {
+						error: error instanceof Error ? error.message : String(error),
+					});
+				});
+			} else {
+				this.session.steer?.({ customType: "task-notification", content, details });
+			}
+		};
+		const schedulePersistentNotification = (line: string) => {
+			latestLine = line;
+			sequence += 1;
+			coalescedCount += flushScheduled ? 1 : 0;
+			if (flushScheduled) return;
+			flushScheduled = true;
+			queueMicrotask(flushLatest);
+		};
 		const monitorJob = await bash.startMonitorJob(
 			{ command: params.command, timeout: params.timeout },
 			{
 				ownerId,
 				label,
 				ctx: context,
+				shouldAcceptRawLine: () => !controller.closed,
+				lifecycle: {
+					onCancel: () => closeMonitor("purge"),
+					onTerminal: () => closeMonitor("flush"),
+					onEvict: () => closeMonitor("purge"),
+					onTombstonePurge: () => closeMonitor("purge"),
+				},
 				onRawLine: (line, jobId) => {
+					if (controller.closed) return;
+					currentJobId = jobId;
 					if (!persistent && deliveredFirstLine) return;
 					deliveredFirstLine = true;
-					const content = `<task-notification>\nMonitor task ${jobId} (${params.kind}: ${params.description}) emitted:\n${line}\n</task-notification>`;
-					const details = { taskId: jobId, kind: params.kind, description: params.description };
-					const sendPromise = this.session.sendCustomMessage?.(
-						{ customType: "task-notification", content, display: false, attribution: "agent", details },
-						{ triggerTurn: true, deliverAs: "followUp" },
-					);
-					if (sendPromise) {
-						void sendPromise.catch(error => {
-							logger.warn("Monitor task-notification delivery failed", {
-								error: error instanceof Error ? error.message : String(error),
-							});
-						});
-					} else {
-						this.session.steer?.({ customType: "task-notification", content, details });
-					}
-					if (!persistent) {
-						manager.cancel(jobId, ownerId ? { ownerId } : undefined);
+					if (persistent) {
+						schedulePersistentNotification(line);
+						return;
 					}
+					sendNotification(line, jobId, 0);
+					manager.cancel(jobId, ownerId ? { ownerId } : undefined);
 				},
 			},
 		);
+		currentJobId = monitorJob.jobId;
 
 		const startedText = `Monitor started · task ${monitorJob.jobId} · persistent: ${persistent}`;
 

package/src/utils/commit-message-generator.ts

@@ -1,5 +1,5 @@
 /**
- * Generate commit messages from diffs using a smol, fast model.
+ * Generate commit messages from diffs using the default model.
  * Follows the same pattern as title-generator.ts.
  */
 import type { ThinkingLevel } from "@gajae-code/agent-core";
@@ -9,7 +9,6 @@ import { logger, prompt } from "@gajae-code/utils";
 import type { ModelRegistry } from "../config/model-registry";
 import { resolveModelRoleValue } from "../config/model-resolver";
 import type { Settings } from "../config/settings";
-import MODEL_PRIO from "../priority.json" with { type: "json" };
 import commitSystemPrompt from "../prompts/system/commit-message-system.md" with { type: "text" };
 import { toReasoningEffort } from "../thinking";
 
@@ -36,7 +35,7 @@ function filterDiffNoise(diff: string): string {
 	return filtered.join("\n");
 }
 
-function getSmolModelCandidates(
+function getModelCandidates(
 	registry: ModelRegistry,
 	settings: Settings,
 ): Array<{ model: Model<Api>; thinkingLevel?: ThinkingLevel }> {
@@ -51,18 +50,12 @@ function getSmolModelCandidates(
 	};
 
 	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
-	const configuredSmol = resolveModelRoleValue(settings.getModelRole("smol"), availableModels, {
+	const configured = resolveModelRoleValue(settings.getModelRole("default"), availableModels, {
 		settings,
 		matchPreferences,
 		modelRegistry: registry,
 	});
-	addCandidate(configuredSmol.model, configuredSmol.thinkingLevel);
-
-	for (const pattern of MODEL_PRIO.smol) {
-		const needle = pattern.toLowerCase();
-		addCandidate(availableModels.find(m => m.id.toLowerCase() === needle));
-		addCandidate(availableModels.find(m => m.id.toLowerCase().includes(needle)));
-	}
+	addCandidate(configured.model, configured.thinkingLevel);
 
 	for (const model of availableModels) {
 		addCandidate(model);
@@ -81,9 +74,9 @@ export async function generateCommitMessage(
 	settings: Settings,
 	sessionId?: string,
 ): Promise<string | null> {
-	const candidates = getSmolModelCandidates(registry, settings);
+	const candidates = getModelCandidates(registry, settings);
 	if (candidates.length === 0) {
-		logger.debug("commit-msg-generator: no smol model found");
+		logger.debug("commit-msg-generator: no model found");
 		return null;
 	}
 

package/src/utils/title-generator.ts

@@ -40,7 +40,7 @@ function getTitleModel(registry: ModelRegistry, settings: Settings, currentModel
 	const availableModels = registry.getAvailable();
 	if (availableModels.length === 0) return undefined;
 
-	const titleModel = resolveRoleSelection(["commit", "smol"], settings, availableModels, registry)?.model;
+	const titleModel = resolveRoleSelection(["default"], settings, availableModels, registry)?.model;
 	if (titleModel) return titleModel;
 
 	if (currentModel) return currentModel;

package/dist/types/harness-control-plane/frame-mapper.d.ts

@@ -1,29 +0,0 @@
-/**
- * Pure mapping from `gjc --mode rpc` event frames (docs/rpc.md) to bounded owner event kinds
- * and {@link ObservedSignal}s. The owner feeds raw frames through this mapper and emits the
- * result via its single-writer #emit — the mapper itself performs NO IO and NO appends.
- *
- * Hard rule: evidence is BOUNDED — only ids, names, categories, statuses, cursors, timestamps,
- * and short codes/messages. Never assistant text, message deltas, command output, or raw args.
- */
-import type { ObservedSignal } from "./types";
-export interface MappedFrame {
-    /** Owner event kind (rpc_*). */
-    kind: string;
-    /** Bounded observed signal, or null when the frame carries no user-facing signal. */
-    signal: ObservedSignal | null;
-    /** Bounded evidence — ids/names/statuses/cursors/timestamps/short codes only. */
-    evidence: Record<string, unknown>;
-    /** Severity for the emitted event. */
-    severity: "info" | "warn" | "critical";
-    /** Never-drop frames (must be enqueued in order, never coalesced away). */
-    semantic: boolean;
-    /** Coalescing key for high-frequency non-semantic frames (message id / tool id); null otherwise. */
-    coalesceKey: string | null;
-}
-export declare function isTestRunnerTool(toolName?: unknown, command?: unknown): boolean;
-/**
- * Map a single RPC frame. Returns null for frames that carry no observability value
- * (or that the adapter handles itself: `ready`, `response`).
- */
-export declare function mapRpcFrame(frame: Record<string, unknown>): MappedFrame | null;