@agi-cli/server 0.1.73 → 0.1.74

package/package.json

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

package/src/routes/session-messages.ts

@@ -99,6 +99,7 @@ export function registerSessionMessagesRoutes(app: Hono) {
 			const modelName = body?.model ?? sess.model ?? cfg.defaults.model;
 			const agent = body?.agent ?? sess.agent ?? cfg.defaults.agent;
 			const content = body?.content ?? '';
+			const userContext = body?.userContext;
 
 			// Validate model capabilities if tools are allowed for this agent
 			const wantsToolCalls = true; // agent toolset may be non-empty
@@ -131,6 +132,7 @@ export function registerSessionMessagesRoutes(app: Hono) {
 				model: modelName,
 				content,
 				oneShot: Boolean(body?.oneShot),
+				userContext,
 			});
 			return c.json({ messageId: assistantMessageId }, 202);
 		} catch (error) {

package/src/runtime/api-error.ts

@@ -70,8 +70,14 @@ export function serializeError(err: unknown): APIErrorResponse {
 	const payload = toErrorPayload(err);
 
 	// Determine HTTP status code
-	let status = 500;
-	if (err && typeof err === 'object') {
+	// Default to 400 for generic errors (client errors)
+	// Only use 500 if explicitly set or for APIError instances without a status
+	let status = 400;
+
+	// Handle APIError instances first
+	if (err instanceof APIError) {
+		status = err.status;
+	} else if (err && typeof err === 'object') {
 		const errObj = err as Record<string, unknown>;
 		if (typeof errObj.status === 'number') {
 			status = errObj.status;
@@ -86,11 +92,6 @@ export function serializeError(err: unknown): APIErrorResponse {
 		}
 	}
 
-	// Handle APIError instances
-	if (err instanceof APIError) {
-		status = err.status;
-	}
-
 	// Extract code if available
 	let code: string | undefined;
 	if (err && typeof err === 'object') {

package/src/runtime/message-service.ts

@@ -20,13 +20,23 @@ type DispatchOptions = {
 	model: string;
 	content: string;
 	oneShot?: boolean;
+	userContext?: string;
 };
 
 export async function dispatchAssistantMessage(
 	options: DispatchOptions,
 ): Promise<{ assistantMessageId: string }> {
-	const { cfg, db, session, agent, provider, model, content, oneShot } =
-		options;
+	const {
+		cfg,
+		db,
+		session,
+		agent,
+		provider,
+		model,
+		content,
+		oneShot,
+		userContext,
+	} = options;
 	const sessionId = session.id;
 	const now = Date.now();
 	const userMessageId = crypto.randomUUID();
@@ -99,6 +109,7 @@ export async function dispatchAssistantMessage(
 		model,
 		projectRoot: cfg.projectRoot,
 		oneShot: Boolean(oneShot),
+		userContext,
 	});
 
 	void touchSessionLastActive({ db, sessionId });
@@ -385,8 +396,8 @@ function deriveTitle(text: string): string {
 
 function sanitizeTitle(s: string): string {
 	let t = s.trim();
-	t = t.replace(/^['"""''()[\]]+|['"""''()[\]]+$/g, '').trim();
-	t = t.replace(/[\s\-_:–—]+$/g, '').trim();
+	t = t.replace(/^['"""''()[\\]]+|['"""''()[\\]]+$/g, '').trim();
+	t = t.replace(/[\\s\\-_:–—]+$/g, '').trim();
 	if (t.length > 64) t = `${t.slice(0, 63).trimEnd()}…`;
 	return t;
 }

package/src/runtime/prompt.ts

@@ -20,6 +20,7 @@ export async function composeSystemPrompt(options: {
 	spoofPrompt?: string;
 	includeEnvironment?: boolean;
 	includeProjectTree?: boolean;
+	userContext?: string;
 }): Promise<string> {
 	if (options.spoofPrompt) {
 		return options.spoofPrompt.trim();
@@ -61,6 +62,16 @@ export async function composeSystemPrompt(options: {
 		}
 	}
 
+	// Add user-provided context if present
+	if (options.userContext?.trim()) {
+		const userContextBlock = [
+			'<user-provided-state-context>',
+			options.userContext.trim(),
+			'</user-provided-state-context>',
+		].join('\n');
+		parts.push(userContextBlock);
+	}
+
 	const composed = parts.filter(Boolean).join('\n\n').trim();
 	if (composed) return composed;
 

package/src/runtime/runner.ts

@@ -146,6 +146,7 @@ async function runAssistant(opts: RunOpts) {
 			oneShot: opts.oneShot,
 			spoofPrompt: undefined,
 			includeProjectTree: isFirstMessage,
+			userContext: opts.userContext,
 		});
 		additionalSystemMessages = [{ role: 'system', content: fullPrompt }];
 	} else {
@@ -157,6 +158,7 @@ async function runAssistant(opts: RunOpts) {
 			oneShot: opts.oneShot,
 			spoofPrompt: undefined,
 			includeProjectTree: isFirstMessage,
+			userContext: opts.userContext,
 		});
 	}
 	systemTimer.end();

package/src/runtime/session-queue.ts

@@ -9,6 +9,7 @@ export type RunOpts = {
 	model: string;
 	projectRoot: string;
 	oneShot?: boolean;
+	userContext?: string;
 	abortSignal?: AbortSignal;
 };
 
@@ -39,7 +40,8 @@ export function enqueueAssistantRun(
 }
 
 /**
- * Aborts all pending operations for a given session.
+ * Signals the abort controller for a session.
+ * This will trigger the abortSignal in the streamText call.
  */
 export function abortSession(sessionId: string) {
 	const controller = sessionAbortControllers.get(sessionId);
@@ -49,34 +51,25 @@ export function abortSession(sessionId: string) {
 	}
 }
 
-/**
- * Gets the current state of a session's queue.
- */
 export function getRunnerState(sessionId: string): RunnerState | undefined {
 	return runners.get(sessionId);
 }
 
-/**
- * Marks a session queue as running.
- */
 export function setRunning(sessionId: string, running: boolean) {
 	const state = runners.get(sessionId);
-	if (state) {
-		state.running = running;
-	}
+	if (state) state.running = running;
 }
 
-/**
- * Dequeues the next job from a session's queue.
- */
 export function dequeueJob(sessionId: string): RunOpts | undefined {
 	const state = runners.get(sessionId);
 	return state?.queue.shift();
 }
 
-/**
- * Cleanup abort controller for a session (called when queue is done).
- */
 export function cleanupSession(sessionId: string) {
-	sessionAbortControllers.delete(sessionId);
+	const state = runners.get(sessionId);
+	if (state && state.queue.length === 0 && !state.running) {
+		runners.delete(sessionId);
+		// Clean up any lingering abort controller
+		sessionAbortControllers.delete(sessionId);
+	}
 }