@clinebot/core 0.0.4 → 0.0.5

package/dist/runtime/session-runtime.d.ts

@@ -1,7 +1,7 @@
 import type { AgentConfig, AgentHooks, AgentResult, AgentTeamsRuntime, Tool } from "@clinebot/agents";
 import type { BasicLogger } from "@clinebot/shared";
 import type { UserInstructionConfigWatcher } from "../agents";
-import type { ToolExecutors } from "../default-tools";
+import type { ToolExecutors } from "../tools";
 import type { CoreSessionConfig } from "../types/config";
 export interface BuiltRuntime {
     tools: Tool[];

package/dist/session/default-session-manager.d.ts

@@ -1,8 +1,8 @@
 import { Agent, type AgentConfig, type AgentResult, type ToolApprovalRequest, type ToolApprovalResult } from "@clinebot/agents";
 import type { providers as LlmsProviders } from "@clinebot/llms";
-import { type ToolExecutors } from "../default-tools";
 import type { RuntimeBuilder } from "../runtime/session-runtime";
 import { ProviderSettingsManager } from "../storage/provider-settings-manager";
+import { type ToolExecutors } from "../tools";
 import type { CoreSessionEvent } from "../types/events";
 import type { SessionRecord } from "../types/sessions";
 import type { RpcCoreSessionService } from "./rpc-session-service";

package/dist/session/session-host.d.ts

@@ -1,5 +1,5 @@
 import type { AgentConfig, ToolApprovalRequest, ToolApprovalResult } from "@clinebot/agents";
-import type { ToolExecutors } from "../default-tools";
+import type { ToolExecutors } from "../tools";
 import { RpcCoreSessionService } from "./rpc-session-service";
 import type { SessionManager } from "./session-manager";
 import { CoreSessionService } from "./session-service";

package/dist/session/session-manager.d.ts

@@ -15,7 +15,7 @@ export interface StartSessionInput {
     userFiles?: string[];
     userInstructionWatcher?: import("../agents").UserInstructionConfigWatcher;
     onTeamRestored?: () => void;
-    defaultToolExecutors?: Partial<import("../default-tools").ToolExecutors>;
+    defaultToolExecutors?: Partial<import("../tools").ToolExecutors>;
     toolPolicies?: import("@clinebot/agents").AgentConfig["toolPolicies"];
     requestToolApproval?: (request: import("@clinebot/agents").ToolApprovalRequest) => Promise<import("@clinebot/agents").ToolApprovalResult>;
 }

package/dist/session/unified-session-persistence-service.d.ts

@@ -12,6 +12,7 @@ export interface PersistedSessionUpdateInput {
     exitCode?: number | null;
     prompt?: string | null;
     metadataJson?: string | null;
+    title?: string | null;
     parentSessionId?: string | null;
     parentAgentId?: string | null;
     agentId?: string | null;
@@ -55,6 +56,8 @@ export declare class UnifiedSessionPersistenceService {
     private activeTeamTaskSessionId;
     private subagentArtifactPaths;
     private writeSessionManifestFile;
+    private readSessionManifestFile;
+    private applyResolvedTitleToRow;
     private createRootSessionId;
     createRootSessionWithArtifacts(input: CreateRootSessionWithArtifactsInput): Promise<RootSessionArtifacts>;
     writeSessionManifest(manifestPath: string, manifest: SessionManifest): void;
@@ -66,6 +69,7 @@ export declare class UnifiedSessionPersistenceService {
         sessionId: string;
         prompt?: string | null;
         metadata?: Record<string, unknown> | null;
+        title?: string | null;
     }): Promise<{
         updated: boolean;
     }>;

package/dist/types/config.d.ts

@@ -1,7 +1,7 @@
 import type { AgentConfig, AgentHooks, ConsecutiveMistakeLimitContext, ConsecutiveMistakeLimitDecision, HookErrorMode, TeamEvent, Tool } from "@clinebot/agents";
 import type { providers as LlmsProviders } from "@clinebot/llms";
 import type { AgentMode, BasicLogger, SessionExecutionConfig, SessionPromptConfig, SessionWorkspaceConfig } from "@clinebot/shared";
-import type { ToolRoutingRule } from "../default-tools/model-tool-routing.js";
+import type { ToolRoutingRule } from "../tools/model-tool-routing.js";
 export type CoreAgentMode = AgentMode;
 export interface CoreModelConfig {
     providerId: string;

package/package.json

@@ -1,10 +1,11 @@
 {
 	"name": "@clinebot/core",
-	"version": "0.0.4",
+	"version": "0.0.5",
 	"main": "./dist/index.node.js",
 	"dependencies": {
-		"@clinebot/agents": "0.0.4",
-		"@clinebot/llms": "0.0.4",
+		"@clinebot/agents": "0.0.5",
+		"@clinebot/llms": "0.0.5",
+		"better-sqlite3": "^11.10.0",
 		"nanoid": "^5.1.7",
 		"simple-git": "^3.32.3",
 		"yaml": "^2.8.2",

package/src/agents/agent-config-parser.ts

@@ -1,7 +1,7 @@
 import type { AgentConfig, Tool } from "@clinebot/agents";
 import YAML from "yaml";
 import { z } from "zod";
-import { ALL_DEFAULT_TOOL_NAMES, type DefaultToolName } from "../default-tools";
+import { ALL_DEFAULT_TOOL_NAMES, type DefaultToolName } from "../tools";
 
 const AgentConfigFrontmatterSchema = z.object({
 	name: z.string().trim().min(1),

package/src/index.ts

@@ -85,25 +85,6 @@ export {
 	ChatSummarySchema,
 	ChatViewStateSchema,
 } from "./chat/chat-schema";
-export {
-	ALL_DEFAULT_TOOL_NAMES,
-	type AskQuestionExecutor,
-	type CreateBuiltinToolsOptions,
-	type CreateDefaultToolsOptions,
-	createBuiltinTools,
-	createDefaultExecutors,
-	createDefaultTools,
-	createDefaultToolsWithPreset,
-	createToolPoliciesWithPreset,
-	type DefaultExecutorsOptions,
-	type DefaultToolName,
-	DefaultToolNames,
-	type DefaultToolsConfig,
-	type ToolExecutors,
-	type ToolPolicyPresetName,
-	type ToolPresetName,
-	ToolPresets,
-} from "./default-tools";
 export {
 	hasMcpSettingsFile,
 	InMemoryMcpManager,
@@ -135,6 +116,25 @@ export {
 	buildTeamProgressSummary,
 	toTeamProgressLifecycleEvent,
 } from "./team";
+export {
+	ALL_DEFAULT_TOOL_NAMES,
+	type AskQuestionExecutor,
+	type CreateBuiltinToolsOptions,
+	type CreateDefaultToolsOptions,
+	createBuiltinTools,
+	createDefaultExecutors,
+	createDefaultTools,
+	createDefaultToolsWithPreset,
+	createToolPoliciesWithPreset,
+	type DefaultExecutorsOptions,
+	type DefaultToolName,
+	DefaultToolNames,
+	type DefaultToolsConfig,
+	type ToolExecutors,
+	type ToolPolicyPresetName,
+	type ToolPresetName,
+	ToolPresets,
+} from "./tools";
 // Compatibility barrel (legacy imports).
 export type { RuntimeEnvironment, SessionEvent, StoredMessages } from "./types";
 export type { SessionStatus } from "./types/common";

package/src/providers/local-provider-service.ts

@@ -35,6 +35,7 @@ type StoredModelsFile = {
 					name: string;
 					supportsVision?: boolean;
 					supportsAttachments?: boolean;
+					supportsReasoning?: boolean;
 				}
 			>;
 		}
@@ -132,6 +133,24 @@ async function writeModelsFile(
 	await writeFile(filePath, `${JSON.stringify(state, null, 2)}\n`, "utf8");
 }
 
+function toRpcProviderModel(
+	modelId: string,
+	info: {
+		name?: string;
+		capabilities?: string[];
+		thinkingConfig?: unknown;
+	},
+): RpcProviderModel {
+	return {
+		id: modelId,
+		name: info.name ?? modelId,
+		supportsAttachments: info.capabilities?.includes("files"),
+		supportsVision: info.capabilities?.includes("images"),
+		supportsReasoning:
+			info.capabilities?.includes("reasoning") || info.thinkingConfig != null,
+	};
+}
+
 function toProviderCapabilities(
 	capabilities: RpcProviderCapability[] | undefined,
 ): Array<"reasoning" | "prompt-cache" | "tools"> | undefined {
@@ -352,6 +371,7 @@ export async function addLocalProvider(
 	const modelsState = await readModelsFile(modelsPath);
 	const supportsVision = capabilities?.includes("vision") ?? false;
 	const supportsAttachments = supportsVision;
+	const supportsReasoning = capabilities?.includes("reasoning") ?? false;
 	modelsState.providers[providerId] = {
 		provider: {
 			name: providerName,
@@ -368,6 +388,7 @@ export async function addLocalProvider(
 					name: modelId,
 					supportsVision,
 					supportsAttachments,
+					supportsReasoning,
 				},
 			]),
 		),
@@ -394,12 +415,13 @@ export async function listLocalProviders(
 	const providerItems = await Promise.all(
 		ids.map(async (id): Promise<RpcProviderListItem> => {
 			const info = await models.getProvider(id);
+			const providerModels = await getLocalProviderModels(id);
 			const persistedSettings = state.providers[id]?.settings;
 			const providerName = info?.name ?? titleCaseFromId(id);
 			return {
 				id,
 				name: providerName,
-				models: null,
+				models: providerModels.models.length,
 				color: stableColor(id),
 				letter: createLetter(providerName),
 				enabled: Boolean(persistedSettings),
@@ -413,6 +435,7 @@ export async function listLocalProviders(
 				defaultModelId: info?.defaultModelId,
 				authDescription: "This provider uses API keys for authentication.",
 				baseUrlDescription: "The base endpoint to use for provider requests.",
+				modelList: providerModels.models,
 			};
 		}),
 	);
@@ -430,12 +453,7 @@ export async function getLocalProviderModels(
 	const modelMap = await models.getModelsForProvider(id);
 	const items = Object.entries(modelMap)
 		.sort(([a], [b]) => a.localeCompare(b))
-		.map(([modelId, info]) => ({
-			id: modelId,
-			name: info.name ?? modelId,
-			supportsAttachments: info.capabilities?.includes("files"),
-			supportsVision: info.capabilities?.includes("images"),
-		}));
+		.map(([modelId, info]) => toRpcProviderModel(modelId, info));
 	return {
 		providerId: id,
 		models: items,

package/src/runtime/runtime-builder.ts

@@ -14,6 +14,7 @@ import {
 	type SkillConfig,
 	type UserInstructionConfigWatcher,
 } from "../agents";
+import { SqliteTeamStore } from "../storage/sqlite-team-store";
 import {
 	createBuiltinTools,
 	DEFAULT_MODEL_TOOL_ROUTING_RULES,
@@ -22,8 +23,7 @@ import {
 	type ToolExecutors,
 	ToolPresets,
 	type ToolRoutingRule,
-} from "../default-tools";
-import { SqliteTeamStore } from "../storage/sqlite-team-store";
+} from "../tools";
 import type { CoreAgentMode, CoreSessionConfig } from "../types/config";
 import type {
 	RuntimeBuilder,

package/src/runtime/runtime-parity.test.ts

@@ -3,7 +3,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import type { Tool } from "@clinebot/agents";
 import { describe, expect, it } from "vitest";
-import { createBuiltinTools } from "../default-tools";
+import { createBuiltinTools } from "../tools";
 import { DefaultRuntimeBuilder } from "./runtime-builder";
 
 type LegacyConfig = {

package/src/runtime/session-runtime.ts

@@ -7,7 +7,7 @@ import type {
 } from "@clinebot/agents";
 import type { BasicLogger } from "@clinebot/shared";
 import type { UserInstructionConfigWatcher } from "../agents";
-import type { ToolExecutors } from "../default-tools";
+import type { ToolExecutors } from "../tools";
 import type { CoreSessionConfig } from "../types/config";
 
 export interface BuiltRuntime {

package/src/session/default-session-manager.ts

@@ -18,11 +18,6 @@ import { formatUserInputBlock, normalizeUserInput } from "@clinebot/shared";
 import { setHomeDirIfUnset } from "@clinebot/shared/storage";
 import { nanoid } from "nanoid";
 import { resolveAndLoadAgentPlugins } from "../agents/plugin-config-loader";
-import {
-	createBuiltinTools,
-	type ToolExecutors,
-	ToolPresets,
-} from "../default-tools";
 import { enrichPromptWithMentions } from "../input";
 import {
 	createHookAuditHooks,
@@ -36,6 +31,7 @@ import {
 	buildTeamProgressSummary,
 	toTeamProgressLifecycleEvent,
 } from "../team";
+import { createBuiltinTools, type ToolExecutors, ToolPresets } from "../tools";
 import { SessionSource, type SessionStatus } from "../types/common";
 import type { CoreSessionConfig } from "../types/config";
 import type { CoreSessionEvent } from "../types/events";
@@ -565,6 +561,9 @@ export class DefaultSessionManager implements SessionManager {
 		if (!prompt) {
 			throw new Error("prompt cannot be empty");
 		}
+		if (!session.artifacts && !session.pendingPrompt) {
+			session.pendingPrompt = prompt;
+		}
 		await this.ensureSessionPersisted(session);
 		await this.syncOAuthCredentials(session);
 

package/src/session/session-host.ts

@@ -9,8 +9,8 @@ import type {
 import { getRpcServerDefaultAddress, getRpcServerHealth } from "@clinebot/rpc";
 import { resolveSessionDataDir } from "@clinebot/shared/storage";
 import { nanoid } from "nanoid";
-import type { ToolExecutors } from "../default-tools";
 import { SqliteSessionStore } from "../storage/sqlite-session-store";
+import type { ToolExecutors } from "../tools";
 import { DefaultSessionManager } from "./default-session-manager";
 import { RpcCoreSessionService } from "./rpc-session-service";
 import type { SessionManager } from "./session-manager";

package/src/session/session-manager.ts

@@ -16,7 +16,7 @@ export interface StartSessionInput {
 	userFiles?: string[];
 	userInstructionWatcher?: import("../agents").UserInstructionConfigWatcher;
 	onTeamRestored?: () => void;
-	defaultToolExecutors?: Partial<import("../default-tools").ToolExecutors>;
+	defaultToolExecutors?: Partial<import("../tools").ToolExecutors>;
 	toolPolicies?: import("@clinebot/agents").AgentConfig["toolPolicies"];
 	requestToolApproval?: (
 		request: import("@clinebot/agents").ToolApprovalRequest,

package/src/session/unified-session-persistence-service.ts

@@ -10,7 +10,7 @@ import type {
 	SubAgentStartContext,
 } from "@clinebot/agents";
 import type { providers as LlmsProviders } from "@clinebot/llms";
-import { resolveRootSessionId } from "@clinebot/shared";
+import { normalizeUserInput, resolveRootSessionId } from "@clinebot/shared";
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import type { SessionStatus } from "../types/common";
@@ -48,6 +48,58 @@ function stringifyMetadataJson(
 	return JSON.stringify(metadata);
 }
 
+function normalizeSessionTitle(title?: string | null): string | undefined {
+	const trimmed = title?.trim();
+	return trimmed ? trimmed.slice(0, 120) : undefined;
+}
+
+function deriveSessionTitleFromPrompt(
+	prompt?: string | null,
+): string | undefined {
+	const normalizedPrompt = normalizeUserInput(prompt ?? "").trim();
+	if (!normalizedPrompt) {
+		return undefined;
+	}
+	const firstLine = normalizedPrompt.split("\n")[0]?.trim();
+	return normalizeSessionTitle(firstLine);
+}
+
+function normalizeMetadataForStorage(
+	metadata: Record<string, unknown> | null | undefined,
+): Record<string, unknown> | undefined {
+	if (!metadata) {
+		return undefined;
+	}
+	const next = { ...metadata };
+	if (typeof next.title === "string") {
+		const normalizedTitle = normalizeSessionTitle(next.title);
+		if (normalizedTitle) {
+			next.title = normalizedTitle;
+		} else {
+			delete next.title;
+		}
+	} else {
+		delete next.title;
+	}
+	return Object.keys(next).length > 0 ? next : undefined;
+}
+
+function metadataWithResolvedTitle(input: {
+	metadata?: Record<string, unknown> | null;
+	title?: string | null;
+	prompt?: string | null;
+}): Record<string, unknown> | undefined {
+	const next = { ...(normalizeMetadataForStorage(input.metadata) ?? {}) };
+	const resolvedTitle =
+		input.title !== undefined
+			? normalizeSessionTitle(input.title)
+			: deriveSessionTitleFromPrompt(input.prompt);
+	if (resolvedTitle) {
+		next.title = resolvedTitle;
+	}
+	return Object.keys(next).length > 0 ? next : undefined;
+}
+
 export interface PersistedSessionUpdateInput {
 	sessionId: string;
 	expectedStatusLock?: number;
@@ -56,6 +108,7 @@ export interface PersistedSessionUpdateInput {
 	exitCode?: number | null;
 	prompt?: string | null;
 	metadataJson?: string | null;
+	title?: string | null;
 	parentSessionId?: string | null;
 	parentAgentId?: string | null;
 	agentId?: string | null;
@@ -173,6 +226,63 @@ export class UnifiedSessionPersistenceService {
 		);
 	}
 
+	private readSessionManifestFile(sessionId: string): {
+		path: string;
+		manifest?: SessionManifest;
+	} {
+		const manifestPath = this.sessionManifestPath(sessionId, false);
+		if (!existsSync(manifestPath)) {
+			return { path: manifestPath };
+		}
+		try {
+			const manifest = SessionManifestSchema.parse(
+				JSON.parse(readFileSync(manifestPath, "utf8")) as SessionManifest,
+			);
+			return { path: manifestPath, manifest };
+		} catch {
+			return { path: manifestPath };
+		}
+	}
+
+	private applyResolvedTitleToRow(row: SessionRowShape): SessionRowShape {
+		const existingMetadata =
+			typeof row.metadata_json === "string" &&
+			row.metadata_json.trim().length > 0
+				? (() => {
+						try {
+							const parsed = JSON.parse(row.metadata_json) as unknown;
+							if (
+								parsed &&
+								typeof parsed === "object" &&
+								!Array.isArray(parsed)
+							) {
+								return parsed as Record<string, unknown>;
+							}
+						} catch {
+							// Ignore malformed metadata payloads.
+						}
+						return undefined;
+					})()
+				: undefined;
+		const sanitizedMetadata = normalizeMetadataForStorage(existingMetadata);
+		const { manifest } = this.readSessionManifestFile(row.session_id);
+		const manifestTitle = normalizeSessionTitle(
+			typeof manifest?.metadata?.title === "string"
+				? (manifest.metadata.title as string)
+				: undefined,
+		);
+		const resolvedMetadata = manifestTitle
+			? {
+					...(sanitizedMetadata ?? {}),
+					title: manifestTitle,
+				}
+			: sanitizedMetadata;
+		return {
+			...row,
+			metadata_json: stringifyMetadataJson(resolvedMetadata),
+		};
+	}
+
 	private createRootSessionId(): string {
 		return `${Date.now()}_${nanoid(5)}`;
 	}
@@ -207,9 +317,13 @@ export class UnifiedSessionPersistenceService {
 			enable_spawn: input.enableSpawn,
 			enable_teams: input.enableTeams,
 			prompt: input.prompt?.trim() || undefined,
-			metadata: input.metadata,
+			metadata: metadataWithResolvedTitle({
+				metadata: input.metadata,
+				prompt: input.prompt,
+			}),
 			messages_path: messagesPath,
 		});
+		const storedMetadata = normalizeMetadataForStorage(manifest.metadata);
 
 		await this.adapter.upsertSession({
 			session_id: sessionId,
@@ -235,7 +349,7 @@ export class UnifiedSessionPersistenceService {
 			conversation_id: null,
 			is_subagent: 0,
 			prompt: manifest.prompt ?? null,
-			metadata_json: stringifyMetadataJson(manifest.metadata),
+			metadata_json: stringifyMetadataJson(storedMetadata),
 			transcript_path: transcriptPath,
 			hook_path: hookPath,
 			messages_path: messagesPath,
@@ -293,40 +407,86 @@ export class UnifiedSessionPersistenceService {
 		sessionId: string;
 		prompt?: string | null;
 		metadata?: Record<string, unknown> | null;
+		title?: string | null;
 	}): Promise<{ updated: boolean }> {
 		for (let attempt = 0; attempt < 4; attempt++) {
 			const row = await this.adapter.getSession(input.sessionId);
 			if (!row || typeof row.status_lock !== "number") {
 				return { updated: false };
 			}
+			const sanitizedMetadata =
+				input.metadata === undefined
+					? undefined
+					: normalizeMetadataForStorage(input.metadata);
+			const existingMetadata = (() => {
+				const raw = row.metadata_json?.trim();
+				if (!raw) {
+					return undefined;
+				}
+				try {
+					const parsed = JSON.parse(raw) as unknown;
+					if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+						return normalizeMetadataForStorage(
+							parsed as Record<string, unknown>,
+						);
+					}
+				} catch {
+					// Ignore malformed metadata payloads.
+				}
+				return undefined;
+			})();
+			const existingTitle = normalizeSessionTitle(
+				typeof existingMetadata?.title === "string"
+					? (existingMetadata.title as string)
+					: undefined,
+			);
+			const nextTitle =
+				input.title !== undefined
+					? normalizeSessionTitle(input.title)
+					: input.prompt !== undefined
+						? deriveSessionTitleFromPrompt(input.prompt)
+						: existingTitle;
+			const nextMetadata =
+				input.metadata !== undefined
+					? { ...(sanitizedMetadata ?? {}) }
+					: { ...(existingMetadata ?? {}) };
+			if (nextTitle) {
+				nextMetadata.title = nextTitle;
+			} else {
+				delete nextMetadata.title;
+			}
 			const changed = await this.adapter.updateSession({
 				sessionId: input.sessionId,
 				prompt: input.prompt,
 				metadataJson:
-					input.metadata === undefined
+					input.metadata === undefined &&
+					input.prompt === undefined &&
+					input.title === undefined
 						? undefined
-						: stringifyMetadataJson(input.metadata),
+						: stringifyMetadataJson(nextMetadata),
+				title: nextTitle,
 				expectedStatusLock: row.status_lock,
 			});
 			if (!changed.updated) {
 				continue;
 			}
-			const manifestPath = this.sessionManifestPath(input.sessionId, false);
-			if (existsSync(manifestPath)) {
-				try {
-					const manifest = SessionManifestSchema.parse(
-						JSON.parse(readFileSync(manifestPath, "utf8")) as SessionManifest,
-					);
-					if (input.prompt !== undefined) {
-						manifest.prompt = input.prompt ?? undefined;
-					}
-					if (input.metadata !== undefined) {
-						manifest.metadata = input.metadata ?? undefined;
-					}
-					this.writeSessionManifestFile(manifestPath, manifest);
-				} catch {
-					// Ignore malformed manifests and keep backend session state as source of truth.
+			const { path: manifestPath, manifest } = this.readSessionManifestFile(
+				input.sessionId,
+			);
+			if (manifest) {
+				if (input.prompt !== undefined) {
+					manifest.prompt = input.prompt ?? undefined;
+				}
+				const nextMetadata =
+					input.metadata !== undefined
+						? { ...(normalizeMetadataForStorage(input.metadata) ?? {}) }
+						: { ...(normalizeMetadataForStorage(manifest.metadata) ?? {}) };
+				if (nextTitle) {
+					nextMetadata.title = nextTitle;
 				}
+				manifest.metadata =
+					Object.keys(nextMetadata).length > 0 ? nextMetadata : undefined;
+				this.writeSessionManifestFile(manifestPath, manifest);
 			}
 			return { updated: true };
 		}
@@ -422,7 +582,9 @@ export class UnifiedSessionPersistenceService {
 				conversation_id: input.conversationId,
 				is_subagent: 1,
 				prompt,
-				metadata_json: null,
+				metadata_json: stringifyMetadataJson(
+					metadataWithResolvedTitle({ prompt }),
+				),
 				transcript_path: artifactPaths.transcriptPath,
 				hook_path: artifactPaths.hookPath,
 				messages_path: artifactPaths.messagesPath,
@@ -444,6 +606,30 @@ export class UnifiedSessionPersistenceService {
 			agentId: input.agentId,
 			conversationId: input.conversationId,
 			prompt: existing.prompt ?? prompt ?? null,
+			metadataJson: stringifyMetadataJson(
+				metadataWithResolvedTitle({
+					metadata: (() => {
+						const raw = existing.metadata_json?.trim();
+						if (!raw) {
+							return undefined;
+						}
+						try {
+							const parsed = JSON.parse(raw) as unknown;
+							if (
+								parsed &&
+								typeof parsed === "object" &&
+								!Array.isArray(parsed)
+							) {
+								return parsed as Record<string, unknown>;
+							}
+						} catch {
+							// Ignore malformed metadata payloads.
+						}
+						return undefined;
+					})(),
+					prompt: existing.prompt ?? prompt ?? null,
+				}),
+			),
 			expectedStatusLock: existing.status_lock,
 		});
 		return sessionId;
@@ -601,7 +787,9 @@ export class UnifiedSessionPersistenceService {
 			conversation_id: null,
 			is_subagent: 1,
 			prompt: message || `Team task for ${agentId}`,
-			metadata_json: null,
+			metadata_json: stringifyMetadataJson(
+				metadataWithResolvedTitle({ prompt: message }),
+			),
 			transcript_path: transcriptPath,
 			hook_path: hookPath,
 			messages_path: messagesPath,
@@ -750,7 +938,9 @@ export class UnifiedSessionPersistenceService {
 			}
 			rows = await this.adapter.listSessions({ limit: scanLimit });
 		}
-		return rows.slice(0, requestedLimit);
+		return rows
+			.slice(0, requestedLimit)
+			.map((row) => this.applyResolvedTitleToRow(row));
 	}
 
 	async deleteSession(sessionId: string): Promise<{ deleted: boolean }> {

package/src/types/config.ts

@@ -15,7 +15,7 @@ import type {
 	SessionPromptConfig,
 	SessionWorkspaceConfig,
 } from "@clinebot/shared";
-import type { ToolRoutingRule } from "../default-tools/model-tool-routing.js";
+import type { ToolRoutingRule } from "../tools/model-tool-routing.js";
 
 export type CoreAgentMode = AgentMode;