@ottocode/server 0.1.268 → 0.1.269

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/server",
-	"version": "0.1.268",
+	"version": "0.1.269",
 	"description": "HTTP API server for ottocode",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -61,8 +61,8 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@ottocode/database": "0.1.268",
-		"@ottocode/sdk": "0.1.268",
+		"@ottocode/database": "0.1.269",
+		"@ottocode/sdk": "0.1.269",
 		"@hono/zod-openapi": "^1.1.5",
 		"ai-sdk-ollama": "^3.8.3",
 		"drizzle-orm": "^0.44.5",

package/src/routes/terminals/service.ts

@@ -24,17 +24,21 @@ export async function createTerminal(
 		}
 
 		let resolvedCommand = command;
+		let resolvedArgs = args || [];
 		if (command === 'bash' || command === 'sh' || command === 'shell') {
 			resolvedCommand =
 				process.platform === 'win32'
 					? process.env.COMSPEC || 'cmd.exe'
 					: process.env.SHELL || '/bin/bash';
+			if (resolvedArgs.length === 0 && process.platform !== 'win32') {
+				resolvedArgs = process.platform === 'darwin' ? ['-il'] : ['-i'];
+			}
 		}
 		const resolvedCwd = cwd || process.cwd();
 
 		const terminal = terminalManager.create({
 			command: resolvedCommand,
-			args: args || [],
+			args: resolvedArgs,
 			purpose,
 			cwd: resolvedCwd,
 			createdBy: 'user',

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

@@ -15,7 +15,7 @@ export function appendRunnerReminderMessages(args: {
 		messages.push(
 			isOpenAIOAuth
 				? {
-						role: 'system',
+						role: 'user',
 						content:
 							'[system-reminder] Continuing an existing session. Execute directly, use tools as needed, and call `finish` at the end. For simple questions, your answer IS the response — do not add a "Summary:" recap.',
 					}
@@ -32,7 +32,7 @@ export function appendRunnerReminderMessages(args: {
 	messages.push(
 		isOpenAIOAuth
 			? {
-					role: 'system',
+					role: 'user',
 					content:
 						'[system-reminder] Your previous response stopped mid-task. Resume from where you left off and complete the actual work — not a plan-only update.',
 				}

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

@@ -183,3 +183,13 @@ export function appendRunnerPromptMessages(args: {
 		additionalSystemMessages.push(...opts.additionalPromptMessages);
 	}
 }
+
+export function moveSystemMessagesToUserForOpenAIOAuth(
+	messages: Array<{ role: 'system' | 'user'; content: string }>,
+): void {
+	for (const message of messages) {
+		if (message.role !== 'system') continue;
+		message.role = 'user';
+		message.content = `<system-message>${message.content}</system-message>`;
+	}
+}

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

@@ -14,6 +14,7 @@ import { resolveAgentConfig } from './registry.ts';
 import {
 	appendRunnerPromptMessages,
 	buildRunnerPrompt,
+	moveSystemMessagesToUserForOpenAIOAuth,
 } from './runner-setup-prompt.ts';
 import {
 	buildAllowedTools,
@@ -134,6 +135,9 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 		opts,
 		additionalSystemMessages: prompt.additionalSystemMessages,
 	});
+	if (prompt.isOpenAIOAuth) {
+		moveSystemMessagesToUserForOpenAIOAuth(prompt.additionalSystemMessages);
+	}
 
 	const gated = buildAllowedTools({
 		agentName: agentCfg.name,