@ottocode/server 0.1.215 → 0.1.216

package/package.json

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

package/src/openapi/paths/skills.ts

@@ -93,6 +93,90 @@ export const skillsPaths = {
 			},
 		},
 	},
+	'/v1/skills/{name}/files': {
+		get: {
+			tags: ['config'],
+			operationId: 'listSkillFiles',
+			summary: 'List files in a skill directory',
+			parameters: [
+				{
+					in: 'path',
+					name: 'name',
+					required: true,
+					schema: { type: 'string' },
+				},
+				projectQueryParam(),
+			],
+			responses: {
+				200: {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									files: {
+										type: 'array',
+										items: {
+											type: 'object',
+											properties: {
+												relativePath: { type: 'string' },
+												size: { type: 'number' },
+											},
+											required: ['relativePath', 'size'],
+										},
+									},
+								},
+								required: ['files'],
+							},
+						},
+					},
+				},
+				500: errorResponse(),
+			},
+		},
+	},
+	'/v1/skills/{name}/files/{filePath}': {
+		get: {
+			tags: ['config'],
+			operationId: 'getSkillFile',
+			summary: 'Read a specific file from a skill directory',
+			parameters: [
+				{
+					in: 'path',
+					name: 'name',
+					required: true,
+					schema: { type: 'string' },
+				},
+				{
+					in: 'path',
+					name: 'filePath',
+					required: true,
+					schema: { type: 'string' },
+				},
+				projectQueryParam(),
+			],
+			responses: {
+				200: {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									content: { type: 'string' },
+									path: { type: 'string' },
+								},
+								required: ['content', 'path'],
+							},
+						},
+					},
+				},
+				404: errorResponse(),
+				500: errorResponse(),
+			},
+		},
+	},
 	'/v1/skills/validate': {
 		post: {
 			tags: ['config'],

package/src/routes/skills.ts

@@ -2,6 +2,8 @@ import type { Hono } from 'hono';
 import {
 	discoverSkills,
 	loadSkill,
+	loadSkillFile,
+	discoverSkillFiles,
 	findGitRoot,
 	validateSkillName,
 	parseSkillFile,
@@ -61,6 +63,51 @@ export function registerSkillsRoutes(app: Hono) {
 	});
 
 	app.post('/v1/skills/validate', async (c) => {
+		app.get('/v1/skills/:name/files', async (c) => {
+			try {
+				const name = c.req.param('name');
+				const projectRoot = c.req.query('project') || process.cwd();
+				const repoRoot = (await findGitRoot(projectRoot)) ?? projectRoot;
+				await discoverSkills(projectRoot, repoRoot);
+
+				const files = await discoverSkillFiles(name);
+				return c.json({ files });
+			} catch (error) {
+				logger.error('Failed to list skill files', error);
+				const errorResponse = serializeError(error);
+				return c.json(
+					errorResponse,
+					(errorResponse.error.status || 500) as 500,
+				);
+			}
+		});
+
+		app.get('/v1/skills/:name/files/*', async (c) => {
+			try {
+				const name = c.req.param('name');
+				const filePath = c.req.path.replace(`/v1/skills/${name}/files/`, '');
+				const projectRoot = c.req.query('project') || process.cwd();
+				const repoRoot = (await findGitRoot(projectRoot)) ?? projectRoot;
+				await discoverSkills(projectRoot, repoRoot);
+
+				const result = await loadSkillFile(name, filePath);
+				if (!result) {
+					return c.json(
+						{ error: `File '${filePath}' not found in skill '${name}'` },
+						404,
+					);
+				}
+				return c.json({ content: result.content, path: result.resolvedPath });
+			} catch (error) {
+				logger.error('Failed to load skill file', error);
+				const errorResponse = serializeError(error);
+				return c.json(
+					errorResponse,
+					(errorResponse.error.status || 500) as 500,
+				);
+			}
+		});
+
 		try {
 			const body = await c.req.json<{ content: string; path?: string }>();
 			if (!body.content) {

package/src/runtime/message/history-builder.ts

@@ -24,26 +24,30 @@ export async function buildHistoryMessages(
 	const toolHistory = new ToolHistoryTracker();
 
 	for (const m of rows) {
+		const parts = await db
+			.select()
+			.from(messageParts)
+			.where(eq(messageParts.messageId, m.id))
+			.orderBy(asc(messageParts.index));
+
 		if (
 			m.role === 'assistant' &&
 			m.status !== 'complete' &&
 			m.status !== 'completed' &&
-			m.status !== 'error' &&
-			m.id !== currentMessageId
+			m.status !== 'error'
 		) {
+			if (parts.length === 0) {
+				debugLog(
+					`[buildHistoryMessages] Skipping empty assistant message ${m.id} with status ${m.status}`,
+				);
+				continue;
+			}
+
 			debugLog(
-				`[buildHistoryMessages] Skipping assistant message ${m.id} with status ${m.status}`,
+				`[buildHistoryMessages] Including non-complete assistant message ${m.id} (status: ${m.status}) with ${parts.length} parts to preserve context`,
 			);
-			logPendingToolParts(db, m.id);
-			continue;
 		}
 
-		const parts = await db
-			.select()
-			.from(messageParts)
-			.where(eq(messageParts.messageId, m.id))
-			.orderBy(asc(messageParts.index));
-
 		if (m.role === 'user') {
 			const uparts: UIMessage['parts'] = [];
 			for (const p of parts) {
@@ -123,7 +127,6 @@ export async function buildHistoryMessages(
 						if (t) assistantParts.push({ type: 'text', text: t });
 					} catch {}
 				} else if (p.type === 'tool_call') {
-					// Skip compacted tool calls entirely
 					if (p.compactedAt) continue;
 
 					try {
@@ -141,7 +144,6 @@ export async function buildHistoryMessages(
 						}
 					} catch {}
 				} else if (p.type === 'tool_result') {
-					// Skip compacted tool results entirely
 					if (p.compactedAt) continue;
 
 					try {
@@ -159,7 +161,6 @@ export async function buildHistoryMessages(
 						}
 					} catch {}
 				}
-				// Skip error parts in history
 			}
 
 			const toolResultsById = new Map(
@@ -167,14 +168,12 @@ export async function buildHistoryMessages(
 			);
 
 			for (const call of toolCalls) {
-				// Skip finish tool from history - it's internal loop control
 				if (call.name === 'finish') continue;
 
 				const toolType = `tool-${call.name}` as `tool-${string}`;
 				let result = toolResultsById.get(call.callId);
 
 				if (!result) {
-					// Synthesize a result for incomplete tool calls to preserve history
 					debugLog(
 						`[buildHistoryMessages] Synthesizing error result for incomplete tool call ${call.name}#${call.callId}`,
 					);