@ottocode/server 0.1.223 → 0.1.225

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/server",
-	"version": "0.1.223",
+	"version": "0.1.225",
 	"description": "HTTP API server for ottocode",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -49,8 +49,8 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@ottocode/sdk": "0.1.223",
-		"@ottocode/database": "0.1.223",
+		"@ottocode/sdk": "0.1.225",
+		"@ottocode/database": "0.1.225",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9",
 		"zod": "^4.3.6"

package/src/openapi/paths/setu.ts

@@ -447,4 +447,148 @@ export const setuPaths = {
 			},
 		},
 	},
+	'/v1/setu/topup/razorpay/estimate': {
+		get: {
+			tags: ['setu'],
+			operationId: 'getRazorpayTopupEstimate',
+			summary: 'Get estimated fees for a Razorpay topup',
+			parameters: [
+				{
+					in: 'query',
+					name: 'amount',
+					required: true,
+					schema: { type: 'number' },
+					description: 'Amount in USD',
+				},
+			],
+			responses: {
+				200: {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									creditAmountUsd: { type: 'number' },
+									chargeAmountInr: { type: 'number' },
+									feeAmountInr: { type: 'number' },
+									currency: { type: 'string' },
+									exchangeRate: { type: 'number' },
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	},
+	'/v1/setu/topup/razorpay': {
+		post: {
+			tags: ['setu'],
+			operationId: 'createRazorpayOrder',
+			summary: 'Create a Razorpay order for topping up',
+			requestBody: {
+				required: true,
+				content: {
+					'application/json': {
+						schema: {
+							type: 'object',
+							properties: {
+								amount: { type: 'number' },
+							},
+							required: ['amount'],
+						},
+					},
+				},
+			},
+			responses: {
+				200: {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									success: { type: 'boolean' },
+									orderId: { type: 'string' },
+									amount: { type: 'number' },
+									currency: { type: 'string' },
+									creditAmountUsd: { type: 'number' },
+									keyId: { type: 'string' },
+								},
+							},
+						},
+					},
+				},
+				401: {
+					description: 'Wallet not configured',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: { error: { type: 'string' } },
+								required: ['error'],
+							},
+						},
+					},
+				},
+			},
+		},
+	},
+	'/v1/setu/topup/razorpay/verify': {
+		post: {
+			tags: ['setu'],
+			operationId: 'verifyRazorpayPayment',
+			summary: 'Verify Razorpay payment and credit balance',
+			requestBody: {
+				required: true,
+				content: {
+					'application/json': {
+						schema: {
+							type: 'object',
+							properties: {
+								razorpay_order_id: { type: 'string' },
+								razorpay_payment_id: { type: 'string' },
+								razorpay_signature: { type: 'string' },
+							},
+							required: [
+								'razorpay_order_id',
+								'razorpay_payment_id',
+								'razorpay_signature',
+							],
+						},
+					},
+				},
+			},
+			responses: {
+				200: {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									success: { type: 'boolean' },
+									credited: { type: 'number' },
+									newBalance: { type: 'number' },
+								},
+							},
+						},
+					},
+				},
+				401: {
+					description: 'Wallet not configured',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: { error: { type: 'string' } },
+								required: ['error'],
+							},
+						},
+					},
+				},
+			},
+		},
+	},
 } as const;

package/src/routes/setu.ts

@@ -369,4 +369,120 @@ export function registerSetuRoutes(app: Hono) {
 			return c.json(errorResponse, errorResponse.error.status || 500);
 		}
 	});
+
+	app.get('/v1/setu/topup/razorpay/estimate', async (c) => {
+		try {
+			const amount = c.req.query('amount');
+			if (!amount) {
+				return c.json({ error: 'Missing amount parameter' }, 400);
+			}
+
+			const baseUrl = getSetuBaseUrl();
+			const response = await fetch(
+				`${baseUrl}/v1/topup/razorpay/estimate?amount=${amount}`,
+				{
+					method: 'GET',
+					headers: { 'Content-Type': 'application/json' },
+				},
+			);
+
+			const data = await response.json();
+			if (!response.ok) {
+				return c.json(data, response.status as 400 | 500);
+			}
+
+			return c.json(data);
+		} catch (error) {
+			logger.error('Failed to get Razorpay estimate', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
+
+	app.post('/v1/setu/topup/razorpay', async (c) => {
+		try {
+			const privateKey = await getSetuPrivateKey();
+			if (!privateKey) {
+				return c.json({ error: 'Setu wallet not configured' }, 401);
+			}
+
+			const body = await c.req.json();
+			const { amount } = body as { amount: number };
+
+			if (!amount || typeof amount !== 'number') {
+				return c.json({ error: 'Invalid amount' }, 400);
+			}
+
+			const walletHeaders = buildWalletHeaders(privateKey);
+			const baseUrl = getSetuBaseUrl();
+
+			const response = await fetch(`${baseUrl}/v1/topup/razorpay`, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json',
+					...walletHeaders,
+				},
+				body: JSON.stringify({ amount }),
+			});
+
+			const data = await response.json();
+			if (!response.ok) {
+				return c.json(data, response.status as 400 | 500);
+			}
+
+			return c.json(data);
+		} catch (error) {
+			logger.error('Failed to create Razorpay order', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
+
+	app.post('/v1/setu/topup/razorpay/verify', async (c) => {
+		try {
+			const privateKey = await getSetuPrivateKey();
+			if (!privateKey) {
+				return c.json({ error: 'Setu wallet not configured' }, 401);
+			}
+
+			const body = await c.req.json();
+			const { razorpay_order_id, razorpay_payment_id, razorpay_signature } =
+				body as {
+					razorpay_order_id: string;
+					razorpay_payment_id: string;
+					razorpay_signature: string;
+				};
+
+			if (!razorpay_order_id || !razorpay_payment_id || !razorpay_signature) {
+				return c.json({ error: 'Missing payment details' }, 400);
+			}
+
+			const walletHeaders = buildWalletHeaders(privateKey);
+			const baseUrl = getSetuBaseUrl();
+
+			const response = await fetch(`${baseUrl}/v1/topup/razorpay/verify`, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json',
+					...walletHeaders,
+				},
+				body: JSON.stringify({
+					razorpay_order_id,
+					razorpay_payment_id,
+					razorpay_signature,
+				}),
+			});
+
+			const data = await response.json();
+			if (!response.ok) {
+				return c.json(data, response.status as 400 | 500);
+			}
+
+			return c.json(data);
+		} catch (error) {
+			logger.error('Failed to verify Razorpay payment', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
 }

package/src/runtime/agent/oauth-codex-continuation.ts

@@ -7,6 +7,7 @@ export type OauthCodexContinuationInput = {
 	finishReason?: string;
 	rawFinishReason?: string;
 	firstToolSeen: boolean;
+	hasTrailingAssistantText: boolean;
 	droppedPseudoToolText: boolean;
 	lastAssistantText: string;
 };
@@ -40,6 +41,13 @@ function isTruncatedResponse(
 	return rawFinishReason === 'max_output_tokens';
 }
 
+function isMissingAssistantSummary(
+	input: OauthCodexContinuationInput,
+): boolean {
+	if (!input.firstToolSeen) return false;
+	return !input.hasTrailingAssistantText;
+}
+
 const MAX_UNCLEAN_EOF_RETRIES = 1;
 
 function isUncleanEof(input: OauthCodexContinuationInput): boolean {
@@ -68,6 +76,10 @@ export function decideOauthCodexContinuation(
 		return { shouldContinue: true, reason: 'truncated' };
 	}
 
+	if (isMissingAssistantSummary(input)) {
+		return { shouldContinue: true, reason: 'no-trailing-assistant-text' };
+	}
+
 	if (
 		isUncleanEof(input) &&
 		input.continuationCount < MAX_UNCLEAN_EOF_RETRIES

package/src/runtime/agent/runner.ts

@@ -180,7 +180,13 @@ async function runAssistant(opts: RunOpts) {
 	);
 
 	let _finishObserved = false;
+	let _toolActivityObserved = false;
+	let _trailingAssistantTextAfterTool = false;
 	const unsubscribeFinish = subscribe(opts.sessionId, (evt) => {
+		if (evt.type === 'tool.call' || evt.type === 'tool.result') {
+			_toolActivityObserved = true;
+			_trailingAssistantTextAfterTool = false;
+		}
 		if (evt.type !== 'tool.result') return;
 		try {
 			const name = (evt.payload as { name?: string } | undefined)?.name;
@@ -287,6 +293,12 @@ async function runAssistant(opts: RunOpts) {
 				if (accumulated.trim()) {
 					latestAssistantText = accumulated;
 				}
+				if (
+					(delta.trim().length > 0 && _toolActivityObserved) ||
+					(delta.trim().length > 0 && firstToolSeen())
+				) {
+					_trailingAssistantTextAfterTool = true;
+				}
 
 				if (!currentPartId && !accumulated.trim()) {
 					continue;
@@ -404,7 +416,7 @@ async function runAssistant(opts: RunOpts) {
 		}
 
 		debugLog(
-			`[RUNNER] Stream finished. finishSeen=${_finishObserved}, firstToolSeen=${fs}, finishReason=${streamFinishReason}, rawFinishReason=${streamRawFinishReason}`,
+			`[RUNNER] Stream finished. finishSeen=${_finishObserved}, firstToolSeen=${fs}, trailingAssistantTextAfterTool=${_trailingAssistantTextAfterTool}, finishReason=${streamFinishReason}, rawFinishReason=${streamRawFinishReason}`,
 		);
 
 		const MAX_CONTINUATIONS = 6;
@@ -418,6 +430,7 @@ async function runAssistant(opts: RunOpts) {
 			finishReason: streamFinishReason,
 			rawFinishReason: streamRawFinishReason,
 			firstToolSeen: fs,
+			hasTrailingAssistantText: _trailingAssistantTextAfterTool,
 			droppedPseudoToolText: oauthTextGuard?.dropped ?? false,
 			lastAssistantText: latestAssistantText,
 		});