@agi-cli/server 0.1.147 → 0.1.149

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agi-cli/server",
-	"version": "0.1.147",
+	"version": "0.1.149",
 	"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.147",
-		"@agi-cli/database": "0.1.147",
+		"@agi-cli/sdk": "0.1.149",
+		"@agi-cli/database": "0.1.149",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9",
 		"zod": "^4.1.8"

package/src/openapi/schemas.ts

@@ -228,7 +228,12 @@ export const schemas = {
 				type: 'array',
 				items: { $ref: '#/components/schemas/GitFile' },
 			},
+			conflicted: {
+				type: 'array',
+				items: { $ref: '#/components/schemas/GitFile' },
+			},
 			hasChanges: { type: 'boolean' },
+			hasConflicts: { type: 'boolean' },
 		},
 		required: [
 			'branch',
@@ -237,7 +242,9 @@ export const schemas = {
 			'staged',
 			'unstaged',
 			'untracked',
+			'conflicted',
 			'hasChanges',
+			'hasConflicts',
 		],
 	},
 	GitFile: {
@@ -246,12 +253,29 @@ export const schemas = {
 			path: { type: 'string' },
 			status: {
 				type: 'string',
-				enum: ['modified', 'added', 'deleted', 'renamed', 'untracked'],
+				enum: [
+					'modified',
+					'added',
+					'deleted',
+					'renamed',
+					'untracked',
+					'conflicted',
+				],
 			},
 			staged: { type: 'boolean' },
 			insertions: { type: 'integer' },
 			deletions: { type: 'integer' },
 			oldPath: { type: 'string' },
+			conflictType: {
+				type: 'string',
+				enum: [
+					'both-modified',
+					'deleted-by-us',
+					'deleted-by-them',
+					'both-added',
+					'both-deleted',
+				],
+			},
 		},
 		required: ['path', 'status', 'staged'],
 	},

package/src/routes/git/status.ts

@@ -36,7 +36,7 @@ export function registerStatusRoute(app: Hono) {
 				{ cwd: gitRoot },
 			);
 
-			const { staged, unstaged, untracked } = parseGitStatus(
+			const { staged, unstaged, untracked, conflicted } = parseGitStatus(
 				statusOutput,
 				gitRoot,
 			);
@@ -46,7 +46,12 @@ export function registerStatusRoute(app: Hono) {
 			const branch = await getCurrentBranch(gitRoot);
 
 			const hasChanges =
-				staged.length > 0 || unstaged.length > 0 || untracked.length > 0;
+				staged.length > 0 ||
+				unstaged.length > 0 ||
+				untracked.length > 0 ||
+				conflicted.length > 0;
+
+			const hasConflicts = conflicted.length > 0;
 
 			return c.json({
 				status: 'ok',
@@ -59,7 +64,9 @@ export function registerStatusRoute(app: Hono) {
 					staged,
 					unstaged,
 					untracked,
+					conflicted,
 					hasChanges,
+					hasConflicts,
 				},
 			});
 		} catch (error) {

package/src/routes/git/types.ts

@@ -1,12 +1,24 @@
 export interface GitFile {
 	path: string;
 	absPath: string;
-	status: 'modified' | 'added' | 'deleted' | 'renamed' | 'untracked';
+	status:
+		| 'modified'
+		| 'added'
+		| 'deleted'
+		| 'renamed'
+		| 'untracked'
+		| 'conflicted';
 	staged: boolean;
 	insertions?: number;
 	deletions?: number;
 	oldPath?: string;
 	isNew: boolean;
+	conflictType?:
+		| 'both-modified'
+		| 'deleted-by-us'
+		| 'deleted-by-them'
+		| 'both-added'
+		| 'both-deleted';
 }
 
 export interface GitRoot {

package/src/routes/git/utils.ts

@@ -121,6 +121,25 @@ function getStatusFromCodeV2(code: string): GitFile['status'] {
 	}
 }
 
+function getConflictType(xy: string): GitFile['conflictType'] {
+	switch (xy) {
+		case 'UU':
+			return 'both-modified';
+		case 'AA':
+			return 'both-added';
+		case 'DD':
+			return 'both-deleted';
+		case 'DU':
+		case 'UD':
+			return 'deleted-by-us';
+		case 'AU':
+		case 'UA':
+			return 'deleted-by-them';
+		default:
+			return 'both-modified';
+	}
+}
+
 export function parseGitStatus(
 	statusOutput: string,
 	gitRoot: string,
@@ -128,11 +147,13 @@ export function parseGitStatus(
 	staged: GitFile[];
 	unstaged: GitFile[];
 	untracked: GitFile[];
+	conflicted: GitFile[];
 } {
 	const lines = statusOutput.trim().split('\n').filter(Boolean);
 	const staged: GitFile[] = [];
 	const unstaged: GitFile[] = [];
 	const untracked: GitFile[] = [];
+	const conflicted: GitFile[] = [];
 
 	for (const line of lines) {
 		if (line.startsWith('1 ') || line.startsWith('2 ')) {
@@ -174,10 +195,26 @@ export function parseGitStatus(
 				staged: false,
 				isNew: true,
 			});
+		} else if (line.startsWith('u ')) {
+			const parts = line.split(' ');
+			if (parts.length < 11) continue;
+
+			const xy = parts[1];
+			const path = parts.slice(10).join(' ');
+			const absPath = join(gitRoot, path);
+
+			conflicted.push({
+				path,
+				absPath,
+				status: 'conflicted',
+				staged: false,
+				isNew: false,
+				conflictType: getConflictType(xy),
+			});
 		}
 	}
 
-	return { staged, unstaged, untracked };
+	return { staged, unstaged, untracked, conflicted };
 }
 
 export async function getAheadBehind(

package/src/routes/sessions.ts

@@ -8,7 +8,7 @@ import {
 	messageParts,
 	shares,
 } from '@agi-cli/database/schema';
-import { desc, eq, and, ne, inArray } from 'drizzle-orm';
+import { desc, eq, and, ne, inArray, or } from 'drizzle-orm';
 import type { ProviderId } from '@agi-cli/sdk';
 import { isProviderId, catalog } from '@agi-cli/sdk';
 import { resolveAgentConfig } from '../runtime/agent/registry.ts';
@@ -745,10 +745,21 @@ export function registerSessionsRoutes(app: Hono) {
 				return c.json({ error: 'Session not found' }, 404);
 			}
 
-			// Delete existing message parts (the error content)
+			// Delete only error parts - preserve valid text/tool content
 			await db
 				.delete(messageParts)
-				.where(eq(messageParts.messageId, messageId));
+				.where(
+					and(
+						eq(messageParts.messageId, messageId),
+						or(
+							eq(messageParts.type, 'error'),
+							and(
+								eq(messageParts.type, 'tool_call'),
+								eq(messageParts.toolName, 'finish'),
+							),
+						),
+					),
+				);
 
 			// Reset message status to pending
 			await db