@gajae-code/coding-agent 0.18.1 → 0.18.5

package/src/modes/acp/acp-agent.ts

@@ -667,7 +667,9 @@ function logDroppedPromptTerminal(
 	});
 }
 
-type SdkPromptFailedOutcome = Extract<SdkPromptTerminalOutcome, { kind: "failed" }>;
+type SdkPromptFailedOutcome = Extract<SdkPromptTerminalOutcome, { kind: "failed" }> & {
+	deliveryFailure?: { cause: string; frameBytes: number };
+};
 
 /**
  * A prompt rejection that still carries the terminal's structured failure classification.
@@ -803,6 +805,13 @@ function promptFailureWireData(failure: SdkPromptFailedOutcome): Record<string,
 		category: failure.category,
 		retryability: promptFailureRetryability(failure.category),
 		...(isSafePromptFailureCode(failure.providerCode) ? { providerCode: failure.providerCode } : {}),
+		...(failure.deliveryFailure
+			? {
+					reason: "delivery_failed",
+					cause: failure.deliveryFailure.cause,
+					frameBytes: String(failure.deliveryFailure.frameBytes),
+				}
+			: {}),
 		...(operatorMessage === undefined ? {} : { operatorMessage }),
 	};
 }
@@ -921,13 +930,28 @@ function terminalOutcome(event: JsonObject): SdkPromptTerminalOutcome | undefine
 		typeof outcome.message === "string" &&
 		(outcome.provenance === "agent_failed" || outcome.provenance === "deadline")
 	) {
-		return failedPromptOutcome({
+		const failure = failedPromptOutcome({
 			code: outcome.code,
 			provenance: outcome.provenance,
 			...(typeof outcome.providerCode === "string" ? { providerCode: outcome.providerCode } : {}),
 			...(isSdkPromptFailurePhase(outcome.phase) ? { phase: outcome.phase } : {}),
 			evidence: {},
 		});
+		const delivery = object(event.error);
+		if (
+			delivery?.code === "delivery_failed" &&
+			isSafePromptFailureCode(delivery.cause) &&
+			typeof delivery.frameBytes === "number" &&
+			Number.isSafeInteger(delivery.frameBytes) &&
+			delivery.frameBytes >= 0
+		) {
+			const classified: SdkPromptFailedOutcome = {
+				...failure,
+				deliveryFailure: { cause: delivery.cause, frameBytes: delivery.frameBytes },
+			};
+			return classified;
+		}
+		return failure;
 	}
 	return undefined;
 }
@@ -1115,6 +1139,15 @@ function frameMessageRole(event: JsonObject | undefined): string | undefined {
 	return typeof role === "string" ? role : undefined;
 }
 
+function frameMessageHasToolCall(event: JsonObject | undefined): boolean {
+	const content = object(event?.message)?.content;
+	if (!Array.isArray(content)) return false;
+	return content.some(block => {
+		const value = object(block);
+		return value?.type === "toolCall" || value?.type === "tool_use";
+	});
+}
+
 const ACP_CONFIG_OPTIONS = [
 	{ id: MODEL_CONFIG_ID, name: "Model", category: "model", options: [] },
 	{ id: THINKING_CONFIG_ID, name: "Thinking", category: "thought_level", options: [] },
@@ -4205,6 +4238,7 @@ export class AcpAgent implements Agent {
 			typeof event?.type === "string" ? event.type : undefined,
 			typeof event?.toolCallId === "string" ? event.toolCallId : undefined,
 			frameMessageRole(event),
+			frameMessageHasToolCall(event),
 		);
 	}
 
@@ -4966,10 +5000,11 @@ export class AcpAgent implements Agent {
 		// connection watched start. Upgrade it from the frames this prompt actually owned, never
 		// downgrade a terminal that already reported `post_start`, and carry the whole
 		// classification on the rejection so the first-turn retry gate can read it (review P1).
-		const failure =
+		const failure = (
 			outcome.phase === "post_start"
 				? outcome
-				: (rephaseFailedOutcome(outcome, { hasActivity: waiter.observedTurnActivity }) as SdkPromptFailedOutcome);
+				: rephaseFailedOutcome(outcome, { hasActivity: waiter.observedTurnActivity })
+		) as SdkPromptFailedOutcome;
 		waiter.reject(new AcpPromptFailureError(failure));
 	}
 

package/src/modes/controllers/ssh-command-controller.ts

@@ -134,7 +134,9 @@ export class SSHCommandController {
 					this.ctx.showError("Missing value for --port.");
 					return;
 				}
-				const parsed = Number.parseInt(value, 10);
+				// Same rule as the ACP `/ssh add` parser: `Number.parseInt` accepts
+				// trailing garbage ("22oops" -> 22), which would save a typo as a port.
+				const parsed = /^\d+$/.test(value) ? Number.parseInt(value, 10) : Number.NaN;
 				if (Number.isNaN(parsed) || parsed < 1 || parsed > 65535) {
 					this.ctx.showError("Invalid --port value. Must be an integer between 1 and 65535.");
 					return;