@ottocode/server 0.1.191 → 0.1.193

package/package.json

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

package/src/routes/auth.ts

@@ -161,6 +161,27 @@ export function registerAuthRoutes(app: Hono) {
 		}
 	});
 
+	app.get('/v1/auth/setu/export', async (c) => {
+		try {
+			const projectRoot = process.cwd();
+			const wallet = await getSetuWallet(projectRoot);
+
+			if (!wallet) {
+				return c.json({ error: 'Setu wallet not configured' }, 404);
+			}
+
+			return c.json({
+				success: true,
+				publicKey: wallet.publicKey,
+				privateKey: wallet.privateKey,
+			});
+		} catch (error) {
+			logger.error('Failed to export Setu wallet', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
+
 	app.post('/v1/auth/:provider', async (c) => {
 		try {
 			const provider = c.req.param('provider') as ProviderId;

package/src/routes/config/defaults.ts

@@ -12,6 +12,7 @@ export function registerDefaultsRoute(app: Hono) {
 				provider?: string;
 				model?: string;
 				toolApproval?: 'auto' | 'dangerous' | 'all';
+				guidedMode?: boolean;
 				scope?: 'global' | 'local';
 			}>();
 
@@ -21,12 +22,14 @@ export function registerDefaultsRoute(app: Hono) {
 				provider: string;
 				model: string;
 				toolApproval: 'auto' | 'dangerous' | 'all';
+				guidedMode: boolean;
 			}> = {};
 
 			if (body.agent) updates.agent = body.agent;
 			if (body.provider) updates.provider = body.provider;
 			if (body.model) updates.model = body.model;
 			if (body.toolApproval) updates.toolApproval = body.toolApproval;
+			if (body.guidedMode !== undefined) updates.guidedMode = body.guidedMode;
 
 			await setConfig(scope, updates, projectRoot);
 

package/src/routes/config/main.ts

@@ -57,6 +57,7 @@ export function registerMainConfigRoute(app: Hono) {
 					embeddedConfig?.defaults?.toolApproval,
 					cfg.defaults.toolApproval,
 				) as 'auto' | 'dangerous' | 'all',
+				guidedMode: cfg.defaults.guidedMode ?? false,
 			};
 
 			return c.json({

package/src/runtime/agent/runner-setup.ts

@@ -105,6 +105,7 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 		projectRoot: cfg.projectRoot,
 		agentPrompt,
 		oneShot: opts.oneShot,
+		guidedMode: cfg.defaults.guidedMode,
 		spoofPrompt: undefined,
 		includeProjectTree: isFirstMessage,
 		userContext: opts.userContext,

package/src/runtime/agent/runner.ts

@@ -1,11 +1,12 @@
 import { hasToolCall, streamText } from 'ai';
-import { messageParts } from '@ottocode/database/schema';
+import { messages, messageParts } from '@ottocode/database/schema';
 import { eq } from 'drizzle-orm';
 import { publish, subscribe } from '../../events/bus.ts';
 import { debugLog, time } from '../debug/index.ts';
 import { toErrorPayload } from '../errors/handling.ts';
 import {
 	type RunOpts,
+	enqueueAssistantRun,
 	setRunning,
 	dequeueJob,
 	cleanupSession,
@@ -293,13 +294,71 @@ async function runAssistant(opts: RunOpts) {
 		await cleanupEmptyTextParts(opts, db);
 		firstToolTimer.end({ seen: firstToolSeen() });
 
+		let streamFinishReason: string | undefined;
+		try {
+			streamFinishReason = await result.finishReason;
+		} catch {
+			streamFinishReason = undefined;
+		}
+
 		debugLog(
-			`[RUNNER] Stream finished. finishSeen=${_finishObserved}, firstToolSeen=${fs}`,
+			`[RUNNER] Stream finished. finishSeen=${_finishObserved}, firstToolSeen=${fs}, finishReason=${streamFinishReason}`,
 		);
 
-		if (!_finishObserved && fs) {
+		const wasTruncated = streamFinishReason === 'length';
+
+		const shouldContinue = !_finishObserved && (wasTruncated || fs);
+
+		if (shouldContinue) {
+			debugLog(
+				`[RUNNER] WARNING: Stream ended without finish. finishReason=${streamFinishReason}, firstToolSeen=${fs}. Auto-continuing.`,
+			);
+
+			const MAX_CONTINUATIONS = 10;
+			const count = opts.continuationCount ?? 0;
+			if (count < MAX_CONTINUATIONS) {
+				debugLog(
+					`[RUNNER] Auto-continuing (${count + 1}/${MAX_CONTINUATIONS})...`,
+				);
+
+				try {
+					await completeAssistantMessage({}, opts, db);
+				} catch (err) {
+					debugLog(
+						`[RUNNER] completeAssistantMessage failed before continuation: ${err instanceof Error ? err.message : String(err)}`,
+					);
+				}
+
+				const continuationMessageId = crypto.randomUUID();
+				await db.insert(messages).values({
+					id: continuationMessageId,
+					sessionId: opts.sessionId,
+					role: 'assistant',
+					status: 'pending',
+					agent: opts.agent,
+					provider: opts.provider,
+					model: opts.model,
+					createdAt: Date.now(),
+				});
+
+				publish({
+					type: 'message.created',
+					sessionId: opts.sessionId,
+					payload: { id: continuationMessageId, role: 'assistant' },
+				});
+
+				enqueueAssistantRun(
+					{
+						...opts,
+						assistantMessageId: continuationMessageId,
+						continuationCount: count + 1,
+					},
+					runSessionLoop,
+				);
+				return;
+			}
 			debugLog(
-				`[RUNNER] WARNING: Stream ended without finish tool being called. Model was mid-execution (tools were used). This is likely an unclean stream termination from the provider.`,
+				`[RUNNER] Max continuations (${MAX_CONTINUATIONS}) reached, stopping.`,
 			);
 		}
 	} catch (err) {

package/src/runtime/context/environment.ts

@@ -121,12 +121,16 @@ export async function getProjectTree(projectRoot: string): Promise<string> {
 
 export async function findInstructionFiles(
 	projectRoot: string,
+	options?: { guidedMode?: boolean },
 ): Promise<string[]> {
 	const { existsSync } = await import('node:fs');
 	const { join } = await import('node:path');
 	const foundPaths: string[] = [];
 
 	const localFiles = ['AGENTS.md', 'CLAUDE.md', 'CONTEXT.md'];
+	if (options?.guidedMode) {
+		localFiles.push('GUIDED.md');
+	}
 	for (const filename of localFiles) {
 		let currentDir = projectRoot;
 		for (let i = 0; i < 5; i++) {
@@ -158,8 +162,9 @@ export async function findInstructionFiles(
 
 export async function loadInstructionFiles(
 	projectRoot: string,
+	options?: { guidedMode?: boolean },
 ): Promise<string> {
-	const paths = await findInstructionFiles(projectRoot);
+	const paths = await findInstructionFiles(projectRoot, options);
 	if (paths.length === 0) return '';
 
 	const contents: string[] = [];
@@ -181,7 +186,7 @@ export async function loadInstructionFiles(
 
 export async function composeEnvironmentAndInstructions(
 	projectRoot: string,
-	options?: { includeProjectTree?: boolean },
+	options?: { includeProjectTree?: boolean; guidedMode?: boolean },
 ): Promise<string> {
 	const parts: string[] = [];
 
@@ -195,7 +200,9 @@ export async function composeEnvironmentAndInstructions(
 		}
 	}
 
-	const customInstructions = await loadInstructionFiles(projectRoot);
+	const customInstructions = await loadInstructionFiles(projectRoot, {
+		guidedMode: options?.guidedMode,
+	});
 	if (customInstructions) {
 		parts.push(customInstructions);
 	}

package/src/runtime/prompt/builder.ts

@@ -8,6 +8,10 @@ import ONESHOT_PROMPT from '@ottocode/sdk/prompts/modes/oneshot.txt' with {
 	type: 'text',
 };
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+import GUIDED_PROMPT from '@ottocode/sdk/prompts/modes/guided.txt' with {
+	type: 'text',
+};
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import ANTHROPIC_SPOOF_PROMPT from '@ottocode/sdk/prompts/providers/anthropicSpoof.txt' with {
 	type: 'text',
 };
@@ -25,6 +29,7 @@ export async function composeSystemPrompt(options: {
 	projectRoot: string;
 	agentPrompt: string;
 	oneShot?: boolean;
+	guidedMode?: boolean;
 	spoofPrompt?: string;
 	includeEnvironment?: boolean;
 	includeProjectTree?: boolean;
@@ -79,10 +84,21 @@ export async function composeSystemPrompt(options: {
 		components.push('mode:oneshot');
 	}
 
+	if (options.guidedMode) {
+		const guidedBlock = (GUIDED_PROMPT || '').trim();
+		if (guidedBlock) {
+			parts.push(guidedBlock);
+			components.push('mode:guided');
+		}
+	}
+
 	if (options.includeEnvironment !== false) {
 		const envAndInstructions = await composeEnvironmentAndInstructions(
 			options.projectRoot,
-			{ includeProjectTree: options.includeProjectTree },
+			{
+				includeProjectTree: options.includeProjectTree,
+				guidedMode: options.guidedMode,
+			},
 		);
 		if (envAndInstructions) {
 			parts.push(envAndInstructions);

package/src/runtime/session/queue.ts

@@ -17,6 +17,7 @@ export type RunOpts = {
 	compactionContext?: string;
 	toolApprovalMode?: ToolApprovalMode;
 	compactionRetries?: number;
+	continuationCount?: number;
 };
 
 export type QueuedMessage = {