@axhub/acp 0.1.0 → 0.1.2-beta.0

package/dist/lib/conversations/store.mjs

@@ -1,10 +1,13 @@
+import { randomUUID } from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { normalizeAcpProvider } from "../acp2aisdk/provider-registry.mjs";
 import { DEFAULT_PERMISSION_MODE, normalizeWorkspacePath, } from "../acp2aisdk/session-store.mjs";
-import { convertTranscriptToMessageRepository, findProviderSession, loadProviderTranscript, scanProviderSessions, } from "../provider-history/index.mjs";
+import { findProviderSession, scanProviderSessions, } from "../provider-history/index.mjs";
 import { mergePersistedBuiltinToolSettings, normalizePersistedBuiltinToolSettings, } from "../../tools/registry.mjs";
 import { deleteRuntimeMessages, getRuntimeMessageRepository, isRuntimeMessageConversationExpired, pruneExpiredRuntimeMessages, upsertRuntimeMessage, } from "./message-repository.mjs";
+import { loadProviderMessageRepository } from "./provider-message-loader.mjs";
+import { getUserFacingMessageText } from "./title-text.mjs";
 const STORE_VERSION = 1;
 const DEFAULT_CONVERSATION_LIST_LIMIT = 50;
 const MAX_CONVERSATION_LIST_LIMIT = 200;
@@ -141,7 +144,7 @@ async function readStore(workspacePath) {
 }
 async function writeStore(data, workspacePath) {
     const storePath = getStorePath(workspacePath);
-    const tempStorePath = `${storePath}.${process.pid}.${Date.now()}.tmp`;
+    const tempStorePath = `${storePath}.${process.pid}.${Date.now()}.${randomUUID()}.tmp`;
     await fs.mkdir(/* turbopackIgnore: true */ path.dirname(storePath), {
         recursive: true,
     });
@@ -169,7 +172,9 @@ function isRecord(value) {
     return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function normalizeConversationTitle(value, maxLength) {
-    let title = typeof value === "string" ? value.replace(/\s+/g, " ").trim() : "";
+    let title = typeof value === "string"
+        ? getUserFacingMessageText(value).replace(/\s+/g, " ").trim()
+        : "";
     if (maxLength)
         title = title.slice(0, maxLength).trim();
     return title && title !== PLACEHOLDER_TITLE ? title : undefined;
@@ -203,7 +208,7 @@ function titleFromStoredMessage(message) {
     if (!isRecord(content) || content.role !== "user")
         return undefined;
     const body = Array.isArray(content.parts) ? content.parts : content.content;
-    return normalizeConversationTitle(extractStoredText(body), GENERATED_TITLE_MAX_LENGTH);
+    return normalizeConversationTitle(getUserFacingMessageText(extractStoredText(body)), GENERATED_TITLE_MAX_LENGTH);
 }
 function titleFromRuntimeMessages(data, threadId) {
     var _a, _b, _c;
@@ -215,33 +220,6 @@ function titleFromRuntimeMessages(data, threadId) {
     }
     return undefined;
 }
-function backfillMissingConversationTitles(data) {
-    var _a;
-    for (const conversation of data.conversations) {
-        const title = normalizeConversationTitle(conversation.title);
-        if (title) {
-            conversation.title = title;
-            continue;
-        }
-        conversation.title =
-            (_a = titleFromRuntimeMessages(data, conversation.threadId)) !== null && _a !== void 0 ? _a : null;
-    }
-}
-function shouldScanProviderSessionsForTitleBackfill(data, workspacePath) {
-    const activeSessionThreadIds = new Set(data.sessions
-        .filter((session) => session.provider === "codex" &&
-        session.workspacePath === workspacePath &&
-        !!session.acpSessionId &&
-        !session.closedAt)
-        .map((session) => session.threadId));
-    return data.conversations.some((thread) => isActiveConversation(thread) &&
-        thread.provider === "codex" &&
-        thread.workspacePath === workspacePath &&
-        !normalizeConversationTitle(thread.title) &&
-        !!(thread.providerSessionId ||
-            thread.sourcePath ||
-            activeSessionThreadIds.has(thread.threadId)));
-}
 function normalizeBuiltinToolSettings(value) {
     return normalizePersistedBuiltinToolSettings(value);
 }
@@ -291,32 +269,17 @@ function updateConversationRecord(record, request) {
             ? request.lastActiveAt
             : record.lastActiveAt, updatedAt: nowIso(), status: record.status === "deleted" ? "active" : record.status, deletedAt: record.status === "deleted" ? null : record.deletedAt });
 }
-function filterMessagesByFormat(repo, format) {
-    return format
-        ? repo.messages.filter((message) => message.format === format)
-        : repo.messages;
-}
-function errorMessage(error) {
-    return error instanceof Error ? error.message : String(error);
-}
 export async function listConversations(workspacePath, options = {}) {
     const normalizedWorkspacePath = normalizeWorkspacePath(workspacePath);
     const shouldRefreshProvider = options.refreshProvider === true;
-    const snapshot = shouldRefreshProvider
-        ? null
-        : await readStore(normalizedWorkspacePath);
-    const shouldScanProvider = shouldRefreshProvider ||
-        (snapshot
-            ? shouldScanProviderSessionsForTitleBackfill(snapshot, normalizedWorkspacePath)
-            : false);
-    const providerSessions = shouldScanProvider
-        ? await scanProviderSessionsCached(normalizedWorkspacePath, options.refreshProvider)
-        : [];
+    if (!shouldRefreshProvider) {
+        const data = await readStore(normalizedWorkspacePath);
+        return paginateConversations(data.conversations, options);
+    }
+    const providerSessions = await scanProviderSessionsCached(normalizedWorkspacePath, options.refreshProvider);
     return updateStore(normalizedWorkspacePath, (data) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         const now = nowIso();
-        const importProviderSessions = shouldRefreshProvider;
-        backfillMissingConversationTitles(data);
         for (const session of providerSessions) {
             const existingSession = data.sessions.find((record) => {
                 var _a;
@@ -334,8 +297,6 @@ export async function listConversations(workspacePath, options = {}) {
                         thread.providerSessionId === session.sessionId));
             }
             const existing = existingIndex >= 0 ? data.conversations[existingIndex] : null;
-            if (!existing && !importProviderSessions)
-                continue;
             const existingTitle = normalizeConversationTitle(existing === null || existing === void 0 ? void 0 : existing.title);
             const providerTitle = normalizeConversationTitle(session.title);
             const record = Object.assign(Object.assign({}, (existing !== null && existing !== void 0 ? existing : {
@@ -349,9 +310,7 @@ export async function listConversations(workspacePath, options = {}) {
                 thoughtLevel: null,
                 permissionMode: DEFAULT_PERMISSION_MODE,
                 status: "active",
-            })), { updatedAt: (_c = (_b = session.lastActiveAt) !== null && _b !== void 0 ? _b : session.createdAt) !== null && _c !== void 0 ? _c : now, workspacePath: normalizeWorkspacePath((_d = session.workspacePath) !== null && _d !== void 0 ? _d : normalizedWorkspacePath), provider: session.provider, title: (_f = (_e = existingTitle !== null && existingTitle !== void 0 ? existingTitle : providerTitle) !== null && _e !== void 0 ? _e : (existing
-                    ? titleFromRuntimeMessages(data, existing.threadId)
-                    : null)) !== null && _f !== void 0 ? _f : null, providerSessionId: session.sessionId, sourcePath: session.sourcePath, sourceKind: session.sourceKind, lastSeenMtime: session.lastSeenMtime, lastActiveAt: session.lastActiveAt });
+            })), { updatedAt: (_c = (_b = session.lastActiveAt) !== null && _b !== void 0 ? _b : session.createdAt) !== null && _c !== void 0 ? _c : now, workspacePath: normalizeWorkspacePath((_d = session.workspacePath) !== null && _d !== void 0 ? _d : normalizedWorkspacePath), provider: session.provider, title: (_e = existingTitle !== null && existingTitle !== void 0 ? existingTitle : providerTitle) !== null && _e !== void 0 ? _e : null, providerSessionId: session.sessionId, sourcePath: session.sourcePath, sourceKind: session.sourceKind, lastSeenMtime: session.lastSeenMtime, lastActiveAt: session.lastActiveAt });
             if (existingIndex >= 0) {
                 data.conversations[existingIndex] = record;
             }
@@ -463,101 +422,27 @@ async function deleteExpiredRuntimeMessagesForThread(workspacePath, threadId) {
         }
     });
 }
-async function loadProviderMessageRepository({ threadId, format, workspacePath, conversation, }) {
-    var _a, _b;
-    let providerSession = null;
-    let providerSessionError = null;
-    const providerSessionId = (_a = conversation === null || conversation === void 0 ? void 0 : conversation.providerSessionId) !== null && _a !== void 0 ? _a : (threadId.includes(":") ? threadId.slice(threadId.indexOf(":") + 1) : null);
-    const provider = (_b = conversation === null || conversation === void 0 ? void 0 : conversation.provider) !== null && _b !== void 0 ? _b : threadId.split(":")[0];
-    if (!(conversation === null || conversation === void 0 ? void 0 : conversation.sourcePath) && providerSessionId) {
-        try {
-            providerSession = await findProviderSession(provider, providerSessionId, workspacePath);
-        }
-        catch (error) {
-            providerSessionError = errorMessage(error);
-        }
-    }
-    if (conversation === null || conversation === void 0 ? void 0 : conversation.sourcePath) {
-        try {
-            const transcript = await loadProviderTranscript({
-                provider: conversation.provider,
-                sessionId: conversation.providerSessionId,
-                sourcePath: conversation.sourcePath,
-            });
-            const repo = convertTranscriptToMessageRepository(transcript, format !== null && format !== void 0 ? format : "ai-sdk/v6");
-            const messages = filterMessagesByFormat(repo, format);
-            if (messages.length === 0) {
-                return {
-                    messages: [],
-                    diagnostic: {
-                        source: "provider-history",
-                        error: "Provider transcript had no messages",
-                    },
-                };
-            }
-            return {
-                headId: repo.headId,
-                messages,
-                diagnostic: { source: "provider-history" },
-            };
-        }
-        catch (error) {
-            return {
-                messages: [],
-                diagnostic: {
-                    source: "provider-history",
-                    error: errorMessage(error),
-                },
-            };
-        }
-    }
-    if (providerSession === null || providerSession === void 0 ? void 0 : providerSession.sourcePath) {
-        try {
-            const transcript = await loadProviderTranscript({
-                provider: providerSession.provider,
-                sessionId: providerSession.sessionId,
-                sourcePath: providerSession.sourcePath,
-            });
-            const repo = convertTranscriptToMessageRepository(transcript, format !== null && format !== void 0 ? format : "ai-sdk/v6");
-            const messages = filterMessagesByFormat(repo, format);
-            if (messages.length === 0) {
-                return {
-                    messages: [],
-                    diagnostic: {
-                        source: "provider-history",
-                        error: "Provider transcript had no messages",
-                    },
-                };
-            }
-            return {
-                headId: repo.headId,
-                messages,
-                diagnostic: { source: "provider-history" },
-            };
-        }
-        catch (error) {
-            return {
-                messages: [],
-                diagnostic: {
-                    source: "provider-history",
-                    error: errorMessage(error),
-                },
-            };
-        }
-    }
-    return {
-        messages: [],
-        diagnostic: {
-            source: "provider-history",
-            error: providerSessionError !== null && providerSessionError !== void 0 ? providerSessionError : "Provider transcript not found",
-        },
-    };
+async function syncMissingConversationTitleFromMessages({ workspacePath, threadId, messages, }) {
+    const title = messages
+        .map((message) => titleFromStoredMessage(message))
+        .find((candidate) => Boolean(candidate));
+    if (!title)
+        return;
+    await updateStore(workspacePath, (data) => {
+        const record = findActiveConversation(data, threadId);
+        if (!record || normalizeConversationTitle(record.title))
+            return;
+        record.title = title;
+    });
 }
-export async function loadConversationMessages(threadId, format, workspacePath) {
+export async function loadConversationMessages(threadId, format, workspacePath, source = "auto") {
     var _a;
     const data = await readStore(workspacePath);
     const conversation = data.conversations.find((thread) => thread.threadId === threadId && thread.status !== "deleted");
-    if (conversation) {
+    if (source === "runtime") {
+        return getRuntimeMessageRepository(data, threadId, format);
+    }
+    if (conversation && source !== "provider") {
         if (isRuntimeMessageConversationExpired(conversation)) {
             if ((_a = data.messages) === null || _a === void 0 ? void 0 : _a[threadId]) {
                 await deleteExpiredRuntimeMessagesForThread(workspacePath, threadId);
@@ -566,8 +451,16 @@ export async function loadConversationMessages(threadId, format, workspacePath)
         }
         else {
             const runtimeRepo = readRuntimeMessagesIfAvailable(data, threadId, format);
-            if (runtimeRepo)
+            if (runtimeRepo) {
+                if (!normalizeConversationTitle(conversation.title)) {
+                    await syncMissingConversationTitleFromMessages({
+                        workspacePath,
+                        threadId,
+                        messages: runtimeRepo.messages,
+                    });
+                }
                 return runtimeRepo;
+            }
         }
     }
     const providerRepo = await loadProviderMessageRepository({
@@ -576,6 +469,13 @@ export async function loadConversationMessages(threadId, format, workspacePath)
         workspacePath,
         conversation: conversation !== null && conversation !== void 0 ? conversation : null,
     });
+    if (conversation && !normalizeConversationTitle(conversation.title)) {
+        await syncMissingConversationTitleFromMessages({
+            workspacePath,
+            threadId,
+            messages: providerRepo.messages,
+        });
+    }
     return providerRepo;
 }
 export async function saveConversationMessage(threadId, request, workspacePath) {

package/dist/lib/conversations/title-text.d.ts

@@ -0,0 +1,3 @@
+export declare function isDisplayOnlyTagBlock(text: string): boolean;
+export declare function isDisplayOnlyTagStart(text: string): boolean;
+export declare function getUserFacingMessageText(text: string): string;

package/dist/lib/conversations/title-text.mjs

@@ -0,0 +1,81 @@
+const DISPLAY_ONLY_TAG_ROOTS = new Set([
+    "app-context",
+    "collaboration_mode",
+    "developer",
+    "dynamic_context",
+    "environment_context",
+    "permissions instructions",
+    "plugins_instructions",
+    "skills_instructions",
+    "system",
+]);
+function normalizeTagRoot(value) {
+    return value.trim().toLowerCase();
+}
+function isDisplayOnlyTagRoot(root) {
+    const normalizedRoot = normalizeTagRoot(root);
+    if (DISPLAY_ONLY_TAG_ROOTS.has(normalizedRoot))
+        return true;
+    return (normalizedRoot.includes("_") ||
+        normalizedRoot.includes("-") ||
+        normalizedRoot.includes(" "));
+}
+function getOpeningTagRoot(text) {
+    var _a, _b;
+    const match = text.trim().match(/^<([A-Za-z][\w:-]*)(?:\s[^>]*)?>/u);
+    return (_b = (_a = match === null || match === void 0 ? void 0 : match[1]) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : null;
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+}
+function getWrappedTagRoot(text) {
+    var _a, _b;
+    const trimmed = text.trim();
+    const match = trimmed.match(/^<([A-Za-z][\w:-]*)(?:\s[^>]*)?>[\s\S]*<\/\1>$/u);
+    return (_b = (_a = match === null || match === void 0 ? void 0 : match[1]) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : null;
+}
+function extractTaggedText(text, tagName) {
+    var _a, _b, _c;
+    const pattern = new RegExp(`<${tagName}(?:\\s[^>]*)?>([\\s\\S]*?)<\\/${tagName}>`, "iu");
+    return (_c = (_b = (_a = pattern.exec(text)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : "";
+}
+function stripLeadingDisplayOnlyTagBlocks(text) {
+    var _a;
+    let remaining = text.trim();
+    for (let index = 0; index < 10; index += 1) {
+        const openingMatch = remaining.match(/^<([A-Za-z][\w:-]*)(?:\s[^>]*)?>/u);
+        const root = (_a = openingMatch === null || openingMatch === void 0 ? void 0 : openingMatch[1]) === null || _a === void 0 ? void 0 : _a.trim();
+        if (!openingMatch || !root || !isDisplayOnlyTagRoot(root)) {
+            return remaining;
+        }
+        const closingPattern = new RegExp(`</${escapeRegExp(root)}>`, "iu");
+        const contentStart = openingMatch[0].length;
+        const closingMatch = closingPattern.exec(remaining.slice(contentStart));
+        if (!closingMatch)
+            return "";
+        remaining = remaining
+            .slice(contentStart + closingMatch.index + closingMatch[0].length)
+            .trim();
+    }
+    return remaining;
+}
+export function isDisplayOnlyTagBlock(text) {
+    const root = getWrappedTagRoot(text);
+    return root ? isDisplayOnlyTagRoot(root) : false;
+}
+export function isDisplayOnlyTagStart(text) {
+    const root = getOpeningTagRoot(text);
+    return root ? isDisplayOnlyTagRoot(root) : false;
+}
+export function getUserFacingMessageText(text) {
+    const trimmed = text.trim();
+    if (!trimmed)
+        return "";
+    const userMessageText = extractTaggedText(trimmed, "user_message");
+    if (userMessageText)
+        return userMessageText;
+    const stripped = stripLeadingDisplayOnlyTagBlocks(trimmed);
+    return isDisplayOnlyTagBlock(stripped) || isDisplayOnlyTagStart(stripped)
+        ? ""
+        : stripped;
+}

package/dist/lib/conversations/types.d.ts

@@ -1,4 +1,4 @@
-import type { AcpBuiltinToolSettings, AcpPermissionMode, AcpProviderKey } from "../acp2aisdk";
+import type { AcpBuiltinToolSettings, AcpPermissionMode, AcpProviderKey, AcpRunState } from "../acp2aisdk";
 export type ConversationStatus = "active" | "archived" | "deleted";
 export type ConversationSourceKind = "codex-jsonl";
 export type ConversationBuiltinToolSettings = AcpBuiltinToolSettings;
@@ -52,6 +52,17 @@ export type ConversationMessageRepository<TContent = Record<string, unknown>> =
         error?: string;
     };
 };
+export type ConversationMessageSource = "auto" | "provider" | "runtime";
+export type ConversationRuntimeResponse = {
+    threadId: string;
+    provider: AcpProviderKey;
+    workspacePath: string;
+    metadata: {
+        runState: AcpRunState;
+    } | null;
+    acpSessionId: string | null;
+    lastUsedAt: number | null;
+};
 export type ConversationStoreData = {
     version: 1;
     conversations: ConversationRecord[];

package/dist/lib/local-image-files.mjs

@@ -11,6 +11,14 @@ export const LOCAL_IMAGE_FILE_EXTENSIONS = new Set([
     ".webp",
 ]);
 const LOCAL_FILE_EXTENSION_RE = /^\.[A-Za-z0-9][A-Za-z0-9_-]{0,15}$/;
+function decodePathComponent(value) {
+    try {
+        return decodeURIComponent(value);
+    }
+    catch (_a) {
+        return value;
+    }
+}
 export function normalizeLocalFilePath(value) {
     const raw = value.trim();
     if (!raw)
@@ -35,7 +43,7 @@ export function normalizeLocalFilePath(value) {
             return null;
         }
     }
-    const withoutQuery = raw.split(/[?#]/, 1)[0];
+    const withoutQuery = decodePathComponent(raw.split(/[?#]/, 1)[0]);
     const windowsPath = withoutQuery.replace(/^\/([A-Za-z]:[\\/])/, "$1");
     if (path.win32.isAbsolute(windowsPath)) {
         return windowsPath;

package/dist/lib/local-image-paths.mjs

@@ -11,11 +11,36 @@ function trimPathValue(value) {
     }
     return trimmed;
 }
+function decodePathComponent(value) {
+    try {
+        return decodeURIComponent(value);
+    }
+    catch (_a) {
+        return value;
+    }
+}
+function normalizeLocalPathValue(value) {
+    const raw = trimPathValue(value);
+    if (/^https?:\/\//i.test(raw)) {
+        try {
+            const url = new URL(raw);
+            if (LOCAL_HOSTS.has(url.hostname)) {
+                return decodePathComponent(url.pathname);
+            }
+        }
+        catch (_a) {
+            return raw;
+        }
+    }
+    if (raw.startsWith("file://"))
+        return raw;
+    return decodePathComponent(raw);
+}
 function hasImageExtension(value) {
-    return IMAGE_EXTENSION_RE.test(value.split(/\s+/, 1)[0]);
+    return IMAGE_EXTENSION_RE.test(value);
 }
 function hasFileExtension(value) {
-    return FILE_EXTENSION_RE.test(value.split(/\s+/, 1)[0]);
+    return FILE_EXTENSION_RE.test(value);
 }
 function isLocalHostUrl(value) {
     try {
@@ -32,7 +57,7 @@ function isLocalAbsolutePath(value) {
         UNC_LOCAL_PATH_RE.test(value));
 }
 export function isLocalFilePath(value) {
-    const raw = trimPathValue(value);
+    const raw = normalizeLocalPathValue(value);
     if (!hasFileExtension(raw))
         return false;
     if (raw.startsWith("file://"))
@@ -51,7 +76,7 @@ export function isLocalFilePath(value) {
     return isLocalAbsolutePath(raw);
 }
 export function isLocalImagePath(value) {
-    const raw = trimPathValue(value);
+    const raw = normalizeLocalPathValue(value);
     if (!hasImageExtension(raw))
         return false;
     if (raw.startsWith("file://"))
@@ -82,10 +107,10 @@ export function isRenderableImageUrl(value) {
     return false;
 }
 export function getLocalImagePreviewUrl(value) {
-    return `/api/local-files/image?path=${encodeURIComponent(trimPathValue(value))}`;
+    return `/api/local-files/image?path=${encodeURIComponent(normalizeLocalPathValue(value))}`;
 }
 export function getLocalFileName(value) {
-    const raw = trimPathValue(value);
+    const raw = normalizeLocalPathValue(value);
     let pathValue = raw;
     if (raw.startsWith("file://") || isLocalHostUrl(raw)) {
         try {

package/dist/lib/output-artifacts/thread.d.ts

@@ -0,0 +1,22 @@
+import { type AcpOutputArtifact } from "../../components/assistant-ui/addons/output-artifacts";
+import type { ConversationMessageSource, StoredMessageEntry } from "../conversations/types";
+import type { ImageGenerationRecord } from "../../tools/image-generation/shared";
+export type ThreadOutputArtifactCollection = {
+    messages: StoredMessageEntry<Record<string, unknown>>[];
+    artifacts: AcpOutputArtifact[];
+    imageGenerationRecords: ImageGenerationRecord[];
+    workspaceArtifacts: AcpOutputArtifact[];
+    diagnostic?: {
+        source?: string;
+        error?: string;
+    };
+};
+type CollectThreadOutputArtifactsOptions = {
+    threadId: string;
+    workspacePath?: string | null;
+    format?: string | null;
+    source?: ConversationMessageSource;
+    sinceMs?: number | null;
+};
+export declare function collectThreadOutputArtifacts({ threadId, workspacePath, format, source, sinceMs, }: CollectThreadOutputArtifactsOptions): Promise<ThreadOutputArtifactCollection>;
+export {};

package/dist/lib/output-artifacts/thread.mjs

@@ -0,0 +1,47 @@
+import { normalizeAcpOutputArtifacts, } from "../../components/assistant-ui/addons/output-artifacts.mjs";
+import { loadConversationMessages } from "../conversations/store.mjs";
+import { listImageGenerationRecords } from "../../tools/image-generation/service.mjs";
+import { scanWorkspaceOutputArtifacts } from "./workspace.mjs";
+function getArtifactMergeKey(artifact) {
+    return `${artifact.kind}:${artifact.path || artifact.title}`;
+}
+function mergeAcpOutputArtifacts(...collections) {
+    const byKey = new Map();
+    for (const artifact of collections.flat()) {
+        const key = getArtifactMergeKey(artifact);
+        const previous = byKey.get(key);
+        if (!previous ||
+            (!previous.newText && artifact.newText) ||
+            artifact.updatedAt >= previous.updatedAt) {
+            byKey.set(key, artifact);
+        }
+    }
+    return [...byKey.values()];
+}
+function normalizeSinceMs(value) {
+    return Number.isFinite(value) ? Math.max(0, Number(value)) : 0;
+}
+export async function collectThreadOutputArtifacts({ threadId, workspacePath, format = "ai-sdk/v6", source = "auto", sinceMs, }) {
+    const repo = await loadConversationMessages(threadId, format, workspacePath, source);
+    const messages = repo.messages;
+    const messageArtifacts = normalizeAcpOutputArtifacts(messages.map((message) => message.content));
+    const [imageGenerationRecords, workspaceArtifacts] = await Promise.all([
+        listImageGenerationRecords({
+            workspacePath,
+            threadId,
+            limit: 100,
+        }).catch(() => []),
+        scanWorkspaceOutputArtifacts({
+            workspacePath,
+            threadId,
+            sinceMs: normalizeSinceMs(sinceMs),
+        }).catch(() => []),
+    ]);
+    return {
+        messages,
+        artifacts: mergeAcpOutputArtifacts(messageArtifacts, workspaceArtifacts),
+        imageGenerationRecords,
+        workspaceArtifacts,
+        diagnostic: repo.diagnostic,
+    };
+}

package/dist/lib/output-artifacts/workspace.mjs

@@ -54,7 +54,9 @@ function normalizeRelativePath(value) {
 }
 function isWithinWorkspace(root, filePath) {
     const relativePath = path.relative(root, filePath);
-    return Boolean(relativePath && !relativePath.startsWith("..") && !path.isAbsolute(relativePath));
+    return Boolean(relativePath &&
+        !relativePath.startsWith("..") &&
+        !path.isAbsolute(relativePath));
 }
 function isExcludedRelativePath(relativePath) {
     const parts = normalizeRelativePath(relativePath).split("/");
@@ -121,7 +123,9 @@ async function collectCandidateFiles(root) {
     const visit = async (directory) => {
         if (files.length >= MAX_SCAN_FILES)
             return;
-        const entries = await fs.readdir(directory, { withFileTypes: true }).catch(() => []);
+        const entries = await fs
+            .readdir(directory, { withFileTypes: true })
+            .catch(() => []);
         for (const entry of entries) {
             if (files.length >= MAX_SCAN_FILES)
                 return;

package/dist/lib/provider-history/codex.mjs

@@ -1,19 +1,10 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { getUserFacingMessageText, isDisplayOnlyTagBlock, } from "../conversations/title-text.mjs";
 const PROVIDER = "codex";
 const SOURCE_KIND = "codex-jsonl";
 const UUID_RE = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/;
-const DISPLAY_ONLY_TAG_ROOTS = new Set([
-    "app-context",
-    "collaboration_mode",
-    "developer",
-    "environment_context",
-    "permissions instructions",
-    "plugins_instructions",
-    "skills_instructions",
-    "system",
-]);
 const FINAL_ASSISTANT_PHASE = "final_answer";
 function getCodexSessionsRoot() {
     if (process.env.ACP_UI_CODEX_SESSIONS_ROOT) {
@@ -77,20 +68,6 @@ function truncate(text, maxLength) {
         return trimmed;
     return `${trimmed.slice(0, maxLength).trim()}...`;
 }
-function getWrappedTagRoot(text) {
-    var _a, _b;
-    const trimmed = text.trim();
-    const match = trimmed.match(/^<([^>\n]+)>[\s\S]*<\/\1>$/);
-    return (_b = (_a = match === null || match === void 0 ? void 0 : match[1]) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : null;
-}
-function isDisplayOnlyTagBlock(text) {
-    const root = getWrappedTagRoot(text);
-    if (!root)
-        return false;
-    if (DISPLAY_ONLY_TAG_ROOTS.has(root))
-        return true;
-    return root.includes("_") || root.includes("-") || root.includes(" ");
-}
 async function collectJsonlFiles(root) {
     const files = [];
     async function visit(dir) {
@@ -154,10 +131,8 @@ async function parseSessionMeta(filePath, lines) {
             isRecord(value.payload) &&
             value.payload.type === "message" &&
             value.payload.role === "user") {
-            const text = extractText(value.payload.content).trim();
-            if (text &&
-                !text.startsWith("# AGENTS.md") &&
-                !isDisplayOnlyTagBlock(text)) {
+            const text = getUserFacingMessageText(extractText(value.payload.content)).trim();
+            if (text && !text.startsWith("# AGENTS.md")) {
                 firstUserMessage = text;
             }
         }
@@ -171,7 +146,7 @@ async function parseSessionMeta(filePath, lines) {
             value.type === "response_item" &&
             isRecord(value.payload) &&
             value.payload.type === "message") {
-            const text = extractText(value.payload.content).trim();
+            const text = getUserFacingMessageText(extractText(value.payload.content)).trim();
             if (text && !isDisplayOnlyTagBlock(text))
                 summary = text;
         }
@@ -210,7 +185,7 @@ function parseTranscriptMessage(value, index) {
             payload.phase !== FINAL_ASSISTANT_PHASE) {
             return null;
         }
-        const text = extractText(payload.content).trim();
+        const text = getUserFacingMessageText(extractText(payload.content)).trim();
         if (!text || isDisplayOnlyTagBlock(text))
             return null;
         return {

package/dist/public-api/server.d.ts

@@ -1,4 +1,4 @@
-export { cleanupAcpSession, getAcpSessionMetadata, listAcpSessionMetadata, streamAcpChat, } from "../lib/acp2aisdk";
+export { cancelAcpSession, cleanupAcpSession, getAcpSessionMetadata, listAcpSessionMetadata, streamAcpChat, } from "../lib/acp2aisdk";
 export { buildAcpCapabilitySnapshot } from "../lib/acp2aisdk/capabilities";
 export { ACP_PROVIDER_ALIASES, ACP_PROVIDER_DEFAULT_MODE_IDS, ACP_PROVIDER_KEYS, ACP_PROVIDER_REGISTRY, getAcpProviderDefaultModeId, isAcpProviderKey, normalizeAcpProvider, readProviderOverridesFromEnv, resolveAcpProviderConfig, } from "../lib/acp2aisdk/provider-registry";
 export { createAcpSessionKey, createInitialMetadata, DEFAULT_PERMISSION_MODE, DEFAULT_THREAD_ID, getDefaultWorkspacePath, getGlobalAcpSessionStore, normalizeThreadId, normalizeWorkspacePath, SESSION_IDLE_TTL_MS, } from "../lib/acp2aisdk/session-store";