@agi-cli/server 0.1.124 → 0.1.125

package/package.json

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

package/src/index.ts

@@ -15,6 +15,7 @@ import { registerGitRoutes } from './routes/git/index.ts';
 import { registerTerminalsRoutes } from './routes/terminals.ts';
 import { registerSessionFilesRoutes } from './routes/session-files.ts';
 import { registerBranchRoutes } from './routes/branch.ts';
+import { registerResearchRoutes } from './routes/research.ts';
 import type { AgentConfigEntry } from './runtime/agent/registry.ts';
 
 const globalTerminalManager = new TerminalManager();
@@ -66,6 +67,7 @@ function initApp() {
 	registerTerminalsRoutes(app, globalTerminalManager);
 	registerSessionFilesRoutes(app);
 	registerBranchRoutes(app);
+	registerResearchRoutes(app);
 
 	return app;
 }
@@ -133,6 +135,7 @@ export function createStandaloneApp(_config?: StandaloneAppConfig) {
 	registerTerminalsRoutes(honoApp, globalTerminalManager);
 	registerSessionFilesRoutes(honoApp);
 	registerBranchRoutes(honoApp);
+	registerResearchRoutes(honoApp);
 
 	return honoApp;
 }
@@ -228,6 +231,7 @@ export function createEmbeddedApp(config: EmbeddedAppConfig = {}) {
 	registerTerminalsRoutes(honoApp, globalTerminalManager);
 	registerSessionFilesRoutes(honoApp);
 	registerBranchRoutes(honoApp);
+	registerResearchRoutes(honoApp);
 
 	return honoApp;
 }

package/src/routes/research.ts

@@ -0,0 +1,423 @@
+import type { Hono } from 'hono';
+import { loadConfig } from '@agi-cli/sdk';
+import { getDb } from '@agi-cli/database';
+import { sessions, messages, messageParts } from '@agi-cli/database/schema';
+import { desc, eq, and, asc, count } from 'drizzle-orm';
+import type { ProviderId } from '@agi-cli/sdk';
+import { isProviderId, catalog } from '@agi-cli/sdk';
+import { serializeError } from '../runtime/errors/api-error.ts';
+import { logger } from '@agi-cli/sdk';
+import { publish } from '../events/bus.ts';
+
+export function registerResearchRoutes(app: Hono) {
+	app.get('/v1/sessions/:parentId/research', async (c) => {
+		const parentId = c.req.param('parentId');
+		const projectRoot = c.req.query('project') || process.cwd();
+		const cfg = await loadConfig(projectRoot);
+		const db = await getDb(cfg.projectRoot);
+
+		const parentRows = await db
+			.select()
+			.from(sessions)
+			.where(eq(sessions.id, parentId))
+			.limit(1);
+
+		if (!parentRows.length || parentRows[0].projectPath !== cfg.projectRoot) {
+			return c.json({ error: 'Parent session not found' }, 404);
+		}
+
+		const researchRows = await db
+			.select({
+				id: sessions.id,
+				title: sessions.title,
+				createdAt: sessions.createdAt,
+				lastActiveAt: sessions.lastActiveAt,
+				provider: sessions.provider,
+				model: sessions.model,
+			})
+			.from(sessions)
+			.where(
+				and(
+					eq(sessions.parentSessionId, parentId),
+					eq(sessions.sessionType, 'research'),
+				),
+			)
+			.orderBy(desc(sessions.lastActiveAt), desc(sessions.createdAt));
+
+		const sessionsWithCounts = await Promise.all(
+			researchRows.map(async (row) => {
+				const msgCount = await db
+					.select({ count: count() })
+					.from(messages)
+					.where(eq(messages.sessionId, row.id));
+				return {
+					...row,
+					messageCount: msgCount[0]?.count ?? 0,
+				};
+			}),
+		);
+
+		return c.json({ sessions: sessionsWithCounts });
+	});
+
+	app.post('/v1/sessions/:parentId/research', async (c) => {
+		const parentId = c.req.param('parentId');
+		const projectRoot = c.req.query('project') || process.cwd();
+		const cfg = await loadConfig(projectRoot);
+		const db = await getDb(cfg.projectRoot);
+		const body = (await c.req.json().catch(() => ({}))) as Record<
+			string,
+			unknown
+		>;
+
+		const parentRows = await db
+			.select()
+			.from(sessions)
+			.where(eq(sessions.id, parentId))
+			.limit(1);
+
+		if (!parentRows.length || parentRows[0].projectPath !== cfg.projectRoot) {
+			return c.json({ error: 'Parent session not found' }, 404);
+		}
+
+		const parent = parentRows[0];
+
+		const providerCandidate =
+			typeof body.provider === 'string' ? body.provider : undefined;
+		const provider: ProviderId = (() => {
+			if (providerCandidate && isProviderId(providerCandidate))
+				return providerCandidate;
+			return parent.provider as ProviderId;
+		})();
+
+		const modelCandidate =
+			typeof body.model === 'string' ? body.model.trim() : undefined;
+		const model = modelCandidate?.length ? modelCandidate : parent.model;
+
+		const id = crypto.randomUUID();
+		const now = Date.now();
+		const title = typeof body.title === 'string' ? body.title : null;
+
+		const row = {
+			id,
+			title,
+			agent: 'research',
+			provider,
+			model,
+			projectPath: cfg.projectRoot,
+			createdAt: now,
+			lastActiveAt: now,
+			parentSessionId: parentId,
+			sessionType: 'research',
+			totalInputTokens: null,
+			totalOutputTokens: null,
+			totalCachedTokens: null,
+			totalReasoningTokens: null,
+			totalToolTimeMs: null,
+			toolCountsJson: null,
+		};
+
+		try {
+			await db.insert(sessions).values(row);
+			publish({ type: 'session.created', sessionId: id, payload: row });
+			return c.json({ session: row, parentSessionId: parentId }, 201);
+		} catch (err) {
+			logger.error('Failed to create research session', err);
+			const errorResponse = serializeError(err);
+			return c.json(errorResponse, errorResponse.error.status || 400);
+		}
+	});
+
+	app.delete('/v1/research/:researchId', async (c) => {
+		const researchId = c.req.param('researchId');
+		const projectRoot = c.req.query('project') || process.cwd();
+		const cfg = await loadConfig(projectRoot);
+		const db = await getDb(cfg.projectRoot);
+
+		const rows = await db
+			.select()
+			.from(sessions)
+			.where(eq(sessions.id, researchId))
+			.limit(1);
+
+		if (!rows.length) {
+			return c.json({ error: 'Research session not found' }, 404);
+		}
+
+		const session = rows[0];
+		if (session.projectPath !== cfg.projectRoot) {
+			return c.json(
+				{ error: 'Research session not found in this project' },
+				404,
+			);
+		}
+
+		if (session.sessionType !== 'research') {
+			return c.json({ error: 'Session is not a research session' }, 400);
+		}
+
+		await db.delete(sessions).where(eq(sessions.id, researchId));
+		publish({
+			type: 'session.deleted',
+			sessionId: researchId,
+			payload: { id: researchId },
+		});
+
+		return c.json({ success: true });
+	});
+
+	app.post('/v1/sessions/:parentId/inject', async (c) => {
+		const parentId = c.req.param('parentId');
+		const projectRoot = c.req.query('project') || process.cwd();
+		const cfg = await loadConfig(projectRoot);
+		const db = await getDb(cfg.projectRoot);
+		const body = (await c.req.json().catch(() => ({}))) as Record<
+			string,
+			unknown
+		>;
+
+		const researchSessionId =
+			typeof body.researchSessionId === 'string' ? body.researchSessionId : '';
+		const label =
+			typeof body.label === 'string' ? body.label : 'Research context';
+
+		if (!researchSessionId) {
+			return c.json({ error: 'researchSessionId is required' }, 400);
+		}
+
+		const [parentRows, researchRows] = await Promise.all([
+			db.select().from(sessions).where(eq(sessions.id, parentId)).limit(1),
+			db
+				.select()
+				.from(sessions)
+				.where(eq(sessions.id, researchSessionId))
+				.limit(1),
+		]);
+
+		if (!parentRows.length || parentRows[0].projectPath !== cfg.projectRoot) {
+			return c.json({ error: 'Parent session not found' }, 404);
+		}
+
+		if (!researchRows.length || researchRows[0].sessionType !== 'research') {
+			return c.json({ error: 'Research session not found' }, 404);
+		}
+
+		const researchSession = researchRows[0];
+
+		const researchMessages = await db
+			.select({
+				id: messages.id,
+				role: messages.role,
+				createdAt: messages.createdAt,
+			})
+			.from(messages)
+			.where(eq(messages.sessionId, researchSessionId))
+			.orderBy(asc(messages.createdAt));
+
+		let contextContent = '';
+		for (const msg of researchMessages) {
+			if (msg.role === 'user' || msg.role === 'assistant') {
+				const parts = await db
+					.select({ type: messageParts.type, content: messageParts.content })
+					.from(messageParts)
+					.where(eq(messageParts.messageId, msg.id))
+					.orderBy(asc(messageParts.index));
+
+				for (const part of parts) {
+					if (part.type === 'text' && part.content) {
+						contextContent += `[${msg.role}]: ${part.content}\n\n`;
+					}
+				}
+			}
+		}
+
+		const injectedContext = `<research-context from="${researchSessionId}" label="${label}" injected-at="${new Date().toISOString()}">\n${contextContent}</research-context>`;
+
+		const msgId = crypto.randomUUID();
+		const partId = crypto.randomUUID();
+		const now = Date.now();
+
+		await db.insert(messages).values({
+			id: msgId,
+			sessionId: parentId,
+			role: 'system',
+			status: 'complete',
+			agent: parentRows[0].agent,
+			provider: parentRows[0].provider,
+			model: parentRows[0].model,
+			createdAt: now,
+			completedAt: now,
+		});
+
+		await db.insert(messageParts).values({
+			id: partId,
+			messageId: msgId,
+			index: 0,
+			type: 'text',
+			content: injectedContext,
+			agent: parentRows[0].agent,
+			provider: parentRows[0].provider,
+			model: parentRows[0].model,
+		});
+
+		await db
+			.update(sessions)
+			.set({ lastActiveAt: now })
+			.where(eq(sessions.id, parentId));
+
+		publish({
+			type: 'message.created',
+			sessionId: parentId,
+			payload: {
+				id: msgId,
+				role: 'system',
+				content: injectedContext,
+			},
+		});
+
+		return c.json({
+			injectedMessageId: msgId,
+			tokenEstimate: Math.ceil(injectedContext.length / 4),
+		});
+	});
+
+	app.post('/v1/research/:researchId/export', async (c) => {
+		const researchId = c.req.param('researchId');
+		const projectRoot = c.req.query('project') || process.cwd();
+		const cfg = await loadConfig(projectRoot);
+		const db = await getDb(cfg.projectRoot);
+		const body = (await c.req.json().catch(() => ({}))) as Record<
+			string,
+			unknown
+		>;
+
+		const researchRows = await db
+			.select()
+			.from(sessions)
+			.where(eq(sessions.id, researchId))
+			.limit(1);
+
+		if (!researchRows.length || researchRows[0].sessionType !== 'research') {
+			return c.json({ error: 'Research session not found' }, 404);
+		}
+
+		const researchSession = researchRows[0];
+
+		if (researchSession.projectPath !== cfg.projectRoot) {
+			return c.json({ error: 'Research session not in this project' }, 404);
+		}
+
+		const providerCandidate =
+			typeof body.provider === 'string' ? body.provider : undefined;
+		const provider: ProviderId = (() => {
+			if (providerCandidate && isProviderId(providerCandidate))
+				return providerCandidate;
+			return cfg.defaults.provider;
+		})();
+
+		const modelCandidate =
+			typeof body.model === 'string' ? body.model.trim() : undefined;
+		const model = modelCandidate?.length ? modelCandidate : cfg.defaults.model;
+
+		const agentCandidate =
+			typeof body.agent === 'string' ? body.agent.trim() : undefined;
+		const agent = agentCandidate?.length ? agentCandidate : cfg.defaults.agent;
+
+		const researchMessages = await db
+			.select({
+				id: messages.id,
+				role: messages.role,
+				createdAt: messages.createdAt,
+			})
+			.from(messages)
+			.where(eq(messages.sessionId, researchId))
+			.orderBy(asc(messages.createdAt));
+
+		let contextContent = '';
+		for (const msg of researchMessages) {
+			if (msg.role === 'user' || msg.role === 'assistant') {
+				const parts = await db
+					.select({ type: messageParts.type, content: messageParts.content })
+					.from(messageParts)
+					.where(eq(messageParts.messageId, msg.id))
+					.orderBy(asc(messageParts.index));
+
+				for (const part of parts) {
+					if (part.type === 'text' && part.content) {
+						contextContent += `[${msg.role}]: ${part.content}\n\n`;
+					}
+				}
+			}
+		}
+
+		const injectedContext = `<research-context from="${researchId}" exported-at="${new Date().toISOString()}">\n${contextContent}</research-context>`;
+
+		const newSessionId = crypto.randomUUID();
+		const now = Date.now();
+
+		await db.insert(sessions).values({
+			id: newSessionId,
+			title: researchSession.title ? `From: ${researchSession.title}` : null,
+			agent,
+			provider,
+			model,
+			projectPath: cfg.projectRoot,
+			createdAt: now,
+			lastActiveAt: now,
+			parentSessionId: null,
+			sessionType: 'main',
+			totalInputTokens: null,
+			totalOutputTokens: null,
+			totalCachedTokens: null,
+			totalReasoningTokens: null,
+			totalToolTimeMs: null,
+			toolCountsJson: null,
+		});
+
+		const msgId = crypto.randomUUID();
+		const partId = crypto.randomUUID();
+
+		await db.insert(messages).values({
+			id: msgId,
+			sessionId: newSessionId,
+			role: 'system',
+			status: 'complete',
+			agent,
+			provider,
+			model,
+			createdAt: now,
+			completedAt: now,
+		});
+
+		await db.insert(messageParts).values({
+			id: partId,
+			messageId: msgId,
+			index: 0,
+			type: 'text',
+			content: injectedContext,
+			agent,
+			provider,
+			model,
+		});
+
+		publish({
+			type: 'session.created',
+			sessionId: newSessionId,
+			payload: { id: newSessionId },
+		});
+
+		const newSession = await db
+			.select()
+			.from(sessions)
+			.where(eq(sessions.id, newSessionId))
+			.limit(1);
+
+		return c.json(
+			{
+				newSession: newSession[0],
+				injectedContext,
+			},
+			201,
+		);
+	});
+}

package/src/routes/sessions.ts

@@ -2,7 +2,7 @@ import type { Hono } from 'hono';
 import { loadConfig } from '@agi-cli/sdk';
 import { getDb } from '@agi-cli/database';
 import { sessions, messages, messageParts } from '@agi-cli/database/schema';
-import { desc, eq, and, inArray } from 'drizzle-orm';
+import { desc, eq, and, or, isNull, ne, inArray } from 'drizzle-orm';
 import type { ProviderId } from '@agi-cli/sdk';
 import { isProviderId, catalog } from '@agi-cli/sdk';
 import { resolveAgentConfig } from '../runtime/agent/registry.ts';
@@ -20,7 +20,12 @@ export function registerSessionsRoutes(app: Hono) {
 		const rows = await db
 			.select()
 			.from(sessions)
-			.where(eq(sessions.projectPath, cfg.projectRoot))
+			.where(
+				and(
+					eq(sessions.projectPath, cfg.projectRoot),
+					or(eq(sessions.sessionType, 'main'), isNull(sessions.sessionType)),
+				),
+			)
 			.orderBy(desc(sessions.lastActiveAt), desc(sessions.createdAt));
 		const normalized = rows.map((r) => {
 			let counts: Record<string, unknown> | undefined;
@@ -298,6 +303,32 @@ export function registerSessionsRoutes(app: Hono) {
 			});
 		}
 
+		// If not queued or running, try to delete directly from database
+		// This handles system messages (like injected research context)
+		try {
+			const existingMsg = await db
+				.select()
+				.from(messages)
+				.where(
+					and(eq(messages.id, messageId), eq(messages.sessionId, sessionId)),
+				)
+				.limit(1);
+
+			if (existingMsg.length > 0) {
+				// Delete message parts first (foreign key constraint)
+				await db
+					.delete(messageParts)
+					.where(eq(messageParts.messageId, messageId));
+				// Delete message
+				await db.delete(messages).where(eq(messages.id, messageId));
+
+				return c.json({ success: true, removed: true, wasStored: true });
+			}
+		} catch (err) {
+			logger.error('Failed to delete message from DB', err);
+			return c.json({ success: false, error: 'Failed to delete message' }, 500);
+		}
+
 		return c.json({ success: false, removed: false }, 404);
 	});
 }

package/src/runtime/agent/registry.ts

@@ -15,6 +15,9 @@ import AGENT_PLAN from '@agi-cli/sdk/prompts/agents/plan.txt' with {
 import AGENT_GENERAL from '@agi-cli/sdk/prompts/agents/general.txt' with {
 	type: 'text',
 };
+import AGENT_RESEARCH from '@agi-cli/sdk/prompts/agents/research.txt' with {
+	type: 'text',
+};
 
 export type AgentConfig = {
 	name: string;
@@ -140,6 +143,20 @@ const defaultToolExtras: Record<string, string[]> = {
 	],
 	git: ['git_status', 'git_diff', 'git_commit', 'read', 'ls'],
 	commit: ['git_status', 'git_diff', 'git_commit', 'read', 'ls'],
+	research: [
+		'read',
+		'ls',
+		'tree',
+		'ripgrep',
+		'websearch',
+		'update_todos',
+		'query_sessions',
+		'query_messages',
+		'get_session_context',
+		'search_history',
+		'get_parent_session',
+		'present_action',
+	],
 };
 
 export function defaultToolsForAgent(name: string): string[] {
@@ -288,6 +305,7 @@ export async function resolveAgentConfig(
 			if (n === 'build') return AGENT_BUILD;
 			if (n === 'plan') return AGENT_PLAN;
 			if (n === 'general') return AGENT_GENERAL;
+			if (n === 'research') return AGENT_RESEARCH;
 			return undefined;
 		};
 		const candidate = byName(name)?.trim();

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

@@ -10,6 +10,7 @@ import {
 } from '../prompt/builder.ts';
 import { discoverProjectTools } from '@agi-cli/sdk';
 import { adaptTools } from '../../tools/adapter.ts';
+import { buildDatabaseTools } from '../../tools/database/index.ts';
 import { debugLog, time } from '../debug/index.ts';
 import { buildHistoryMessages } from '../message/history-builder.ts';
 import { getMaxOutputTokens } from '../utils/token.ts';
@@ -170,6 +171,21 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 
 	const toolsTimer = time('runner:discoverTools');
 	const allTools = await discoverProjectTools(cfg.projectRoot);
+
+	if (opts.agent === 'research') {
+		// Get parent session ID for research sessions
+		const currentSession = sessionRows[0];
+		const parentSessionId = currentSession?.parentSessionId ?? null;
+
+		const dbTools = buildDatabaseTools(cfg.projectRoot, parentSessionId);
+		for (const dt of dbTools) {
+			allTools.push(dt);
+		}
+		debugLog(
+			`[tools] Added ${dbTools.length} database tools for research agent (parent: ${parentSessionId ?? 'none'})`,
+		);
+	}
+
 	toolsTimer.end({ count: allTools.length });
 	const allowedNames = new Set([...(agentCfg.tools || []), 'finish']);
 	const gated = allTools.filter((tool) => allowedNames.has(tool.name));

package/src/runtime/message/compaction-auto.ts

@@ -3,6 +3,8 @@ import { messageParts } from '@agi-cli/database/schema';
 import { eq } from 'drizzle-orm';
 import { streamText } from 'ai';
 import { resolveModel } from '../provider/index.ts';
+import { getAuth } from '@agi-cli/sdk';
+import { getProviderSpoofPrompt } from '../prompt/builder.ts';
 import { loadConfig } from '@agi-cli/sdk';
 import { debugLog } from '../debug/index.ts';
 import { getModelLimits } from './compaction-limits.ts';
@@ -52,12 +54,40 @@ export async function performAutoCompaction(
 		debugLog(
 			`[compaction] Using session model ${provider}/${modelId} for auto-compaction`,
 		);
+
+		const auth = await getAuth(
+			provider as
+				| 'anthropic'
+				| 'openai'
+				| 'google'
+				| 'openrouter'
+				| 'opencode'
+				| 'solforge'
+				| 'zai'
+				| 'zai-coding',
+			cfg.projectRoot,
+		);
+		const needsSpoof = auth?.type === 'oauth';
+		const spoofPrompt = needsSpoof
+			? getProviderSpoofPrompt(provider as 'anthropic' | 'openai')
+			: undefined;
+
+		debugLog(
+			`[compaction] OAuth mode: ${needsSpoof}, spoof: ${spoofPrompt ? 'yes' : 'no'}`,
+		);
+
 		const model = await resolveModel(
 			provider as Parameters<typeof resolveModel>[0],
 			modelId,
 			cfg,
 		);
 
+		const compactionPrompt = getCompactionSystemPrompt();
+		const systemPrompt = spoofPrompt ? spoofPrompt : compactionPrompt;
+		const userInstructions = spoofPrompt
+			? `${compactionPrompt}\n\nIMPORTANT: Generate a comprehensive summary. This will replace the detailed conversation history.`
+			: 'IMPORTANT: Generate a comprehensive summary. This will replace the detailed conversation history.';
+
 		const compactPartId = crypto.randomUUID();
 		const now = Date.now();
 
@@ -74,14 +104,13 @@ export async function performAutoCompaction(
 			startedAt: now,
 		});
 
-		const prompt = getCompactionSystemPrompt();
 		const result = streamText({
 			model,
-			system: `${prompt}\n\nIMPORTANT: Generate a comprehensive summary. This will replace the detailed conversation history.`,
+			system: systemPrompt,
 			messages: [
 				{
 					role: 'user',
-					content: `Please summarize this conversation:\n\n<conversation-to-summarize>\n${context}\n</conversation-to-summarize>`,
+					content: `${userInstructions}\n\nPlease summarize this conversation:\n\n<conversation-to-summarize>\n${context}\n</conversation-to-summarize>`,
 				},
 			],
 			maxOutputTokens: 2000,