@gkorepanov/ccodex 0.5.0-rc.2 → 0.5.0-rc.21

package/dist/protocol/turnPagination.d.ts

@@ -16,14 +16,22 @@ interface Page<T> {
     nextCursor: string | null;
     backwardsCursor: string | null;
 }
+interface AnchorCursor {
+    anchor: string;
+    includeAnchor: boolean;
+}
+type CursorKey = "turnId" | "itemId";
 export declare function turnCursor(turnId: string, includeAnchor: boolean): string;
 export declare function itemCursor(itemId: string, includeAnchor: boolean): string;
+export declare function anchorCursor(key: CursorKey, cursor: string): AnchorCursor | undefined;
 /** The agent item stock treats as a turn's final answer: latest final_answer, else a phase-less message on a finished turn. */
 export declare function finalAgentItem(turn: Turn): ThreadItem | undefined;
 /** `itemsView: "summary"`: the first user message and the final agent message, in rollout order. Stock's live view of a running turn shows its latest agent message regardless of phase. */
 export declare function summaryItems(turn: Turn): ThreadItem[];
-export declare function paginateTurns(turns: readonly Turn[], params: TurnsListParams, legacyPrefixes?: readonly string[]): Page<Turn>;
-export declare function paginateItems(turns: readonly Turn[], params: ItemsListParams, legacyPrefixes?: readonly string[]): Page<{
+export declare function paginateTurns(turns: readonly Turn[], params: TurnsListParams): Page<Turn>;
+/** The turn as a turns page shows it (`itemsView`, default summary). */
+export declare function turnView(turn: Turn, itemsView: TurnsListParams["itemsView"]): Turn;
+export declare function paginateItems(turns: readonly Turn[], params: ItemsListParams): Page<{
     turnId: string;
     item: ThreadItem;
 }>;
@@ -34,4 +42,29 @@ export declare function historyCursors(turns: readonly Turn[]): {
     turnsBackwardsCursor: string | null;
     itemsBackwardsCursor: string | null;
 };
+interface Occurrence {
+    turnId: string;
+    itemId: string;
+    snippet: string;
+    snippetMatchRange: {
+        start: number;
+        end: number;
+    };
+    turnCursor: string;
+}
+/**
+ * Stock's `thread/searchOccurrences` (codex-rs thread-store `search.rs`) over turns, oldest first: every match of the
+ * term, any case, in user messages and each turn's final agent message, with the 49 characters before it and 96
+ * after; the match range counts UTF-16 units, as JavaScript does.
+ */
+export declare function turnOccurrences(turns: readonly Turn[], term: string): Occurrence[];
+/** A `thread/searchOccurrences` page of all occurrences (50 by default, at most 250). */
+export declare function occurrencesPage<T>(all: readonly T[], params: {
+    searchTerm?: string;
+    cursor?: string | null;
+    limit?: number | null;
+}): {
+    data: T[];
+    nextCursor: string | null;
+};
 export {};

package/dist/protocol/turnPagination.js

@@ -8,7 +8,7 @@ export function turnCursor(turnId, includeAnchor) {
 export function itemCursor(itemId, includeAnchor) {
     return encodeCursor("itemId", itemId, includeAnchor);
 }
-function anchorCursor(key, cursor) {
+export function anchorCursor(key, cursor) {
     try {
         const parsed = JSON.parse(cursor);
         if (typeof parsed[key] === "string" && typeof parsed.includeAnchor === "boolean") {
@@ -20,15 +20,8 @@ function anchorCursor(key, cursor) {
     }
     return undefined;
 }
-function legacyOffset(cursor, prefixes) {
-    const prefix = prefixes.find((candidate) => cursor.startsWith(candidate));
-    if (!prefix)
-        return undefined;
-    const offset = Number(cursor.slice(prefix.length));
-    return Number.isInteger(offset) && offset >= 0 ? offset : undefined;
-}
 /** Stock-style anchor pagination over a chronological list: cursors name an entry and whether it is included. */
-function paginate(entries, key, idOf, params, legacyPrefixes, defaultDirection, selected = () => true) {
+function paginate(entries, key, idOf, params, defaultDirection, selected = () => true) {
     if (entries.length === 0)
         return { data: [], nextCursor: null, backwardsCursor: null };
     const direction = params.sortDirection ?? defaultDirection;
@@ -37,6 +30,8 @@ function paginate(entries, key, idOf, params, legacyPrefixes, defaultDirection,
         keyed.reverse();
     // Like stock, anchors are positions in the whole list; `selected` (e.g. a turn filter) applies on top.
     const anchor = params.cursor ? anchorCursor(key, params.cursor) : undefined;
+    if (params.cursor && !anchor)
+        throw invalidRequest(`invalid cursor: ${params.cursor}`);
     if (anchor) {
         const anchorIndex = entries.findIndex((entry) => idOf(entry) === anchor.anchor);
         if (anchorIndex < 0)
@@ -46,12 +41,6 @@ function paginate(entries, key, idOf, params, legacyPrefixes, defaultDirection,
             : anchor.includeAnchor ? index <= anchorIndex : index < anchorIndex);
     }
     keyed = keyed.filter(({ entry }) => selected(entry));
-    if (params.cursor && !anchor) {
-        const offset = legacyOffset(params.cursor, legacyPrefixes);
-        if (offset === undefined)
-            throw invalidRequest(`invalid cursor: ${params.cursor}`);
-        keyed = keyed.slice(offset);
-    }
     const limit = Math.max(1, Math.min(params.limit ?? 25, 100));
     const page = keyed.slice(0, limit).map(({ entry }) => entry);
     return {
@@ -72,21 +61,18 @@ export function summaryItems(turn) {
     const final = turn.status === "inProgress" ? turn.items.findLast((item) => item.type === "agentMessage") : finalAgentItem(turn);
     return turn.items.filter((item) => item === first || item === final);
 }
-export function paginateTurns(turns, params, legacyPrefixes = []) {
-    const page = paginate(turns, "turnId", (turn) => turn.id, params, legacyPrefixes, "desc");
-    const itemsView = params.itemsView ?? "summary";
-    return {
-        ...page,
-        data: page.data.map((turn) => ({
-            ...turn,
-            itemsView,
-            items: itemsView === "notLoaded" ? [] : itemsView === "summary" ? summaryItems(turn) : turn.items,
-        })),
-    };
+export function paginateTurns(turns, params) {
+    const page = paginate(turns, "turnId", (turn) => turn.id, params, "desc");
+    return { ...page, data: page.data.map((turn) => turnView(turn, params.itemsView)) };
 }
-export function paginateItems(turns, params, legacyPrefixes = []) {
+/** The turn as a turns page shows it (`itemsView`, default summary). */
+export function turnView(turn, itemsView) {
+    const view = itemsView ?? "summary";
+    return { ...turn, itemsView: view, items: view === "notLoaded" ? [] : view === "summary" ? summaryItems(turn) : turn.items };
+}
+export function paginateItems(turns, params) {
     const entries = turns.flatMap((turn) => turn.items.map((item) => ({ turnId: turn.id, item })));
-    return paginate(entries, "itemId", (entry) => entry.item.id, params, legacyPrefixes, "asc", (entry) => !params.turnId || entry.turnId === params.turnId);
+    return paginate(entries, "itemId", (entry) => entry.item.id, params, "asc", (entry) => !params.turnId || entry.turnId === params.turnId);
 }
 /** The turn shape stock returns from `turn/start` and announces in `turn/started`: no items, `notLoaded`; items follow via `item/started`. */
 export function startedTurn(turn) {
@@ -100,4 +86,43 @@ export function historyCursors(turns) {
         itemsBackwardsCursor: lastItem ? itemCursor(lastItem.id, true) : null,
     };
 }
+/** What stock searches in an agent message: its text without markdown (links read as their labels). */
+function plainText(markdown) {
+    return markdown.replace(/!?\[([^\]]*)\]\([^)]*\)/gu, "$1").replace(/[*_`#>|~]+/gu, " ").split(/\s+/u).filter(Boolean).join(" ");
+}
+/**
+ * Stock's `thread/searchOccurrences` (codex-rs thread-store `search.rs`) over turns, oldest first: every match of the
+ * term, any case, in user messages and each turn's final agent message, with the 49 characters before it and 96
+ * after; the match range counts UTF-16 units, as JavaScript does.
+ */
+export function turnOccurrences(turns, term) {
+    const needle = term.toLowerCase();
+    return turns.flatMap((turn) => {
+        const final = finalAgentItem(turn);
+        return turn.items.filter((item) => item.type === "userMessage" || item === final).flatMap((item) => {
+            const text = item.type === "userMessage" ? item.content.flatMap((input) => input.type === "text" ? [input.text] : []).join("")
+                : plainText(String(item.text));
+            const found = [];
+            for (let at = text.toLowerCase().indexOf(needle); at >= 0; at = text.toLowerCase().indexOf(needle, at + needle.length)) {
+                const before = [...text.slice(0, at)];
+                const after = [...text.slice(at + needle.length)];
+                const head = before.slice(Math.max(0, before.length - 49)).join("");
+                const lead = before.length > 49 ? "... " : "";
+                const start = lead.length + head.length;
+                found.push({
+                    turnId: turn.id, itemId: item.id, turnCursor: turnCursor(turn.id, true),
+                    snippet: `${lead}${head}${text.slice(at, at + needle.length)}${after.slice(0, 96).join("")}${after.length > 96 ? " ..." : ""}`,
+                    snippetMatchRange: { start, end: start + needle.length },
+                });
+            }
+            return found;
+        });
+    });
+}
+/** A `thread/searchOccurrences` page of all occurrences (50 by default, at most 250). */
+export function occurrencesPage(all, params) {
+    const from = params.cursor ? Number(JSON.parse(params.cursor).index) : 0;
+    const limit = Math.max(1, Math.min(params.limit ?? 50, 250));
+    return { data: all.slice(from, from + limit), nextCursor: from + limit < all.length ? JSON.stringify({ searchTerm: params.searchTerm, index: from + limit }) : null };
+}
 //# sourceMappingURL=turnPagination.js.map

package/dist/protocol/turnPagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"turnPagination.js","sourceRoot":"","sources":["../../src/protocol/turnPagination.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turnPagination.js","sourceRoot":"","sources":["../../src/protocol/turnPagination.ts"],"names":[],"mappings":"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"}

package/examples/config.toml

@@ -17,6 +17,6 @@ Return only the title.
 # model_prefix = "claude:"
 
 log_level = "info"
-# Codex App RPC capture under data_dir (rpc.jsonl, mode 0600, rolling).
-rpc_capture = true
+# Codex App RPC capture under data_dir (rpc.jsonl, mode 0600, rolling; holds prompts and outputs). Off by default.
+rpc_capture = false
 rpc_capture_max_bytes = 1073741824

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkorepanov/ccodex",
-  "version": "0.5.0-rc.2",
+  "version": "0.5.0-rc.21",
   "description": "Unofficial Codex App compatibility bridge for Codex CLI and Claude Code runtimes.",
   "homepage": "https://github.com/gkorepanov/ccodex#readme",
   "repository": {
@@ -33,6 +33,7 @@
     "scripts/install-claude-stack.sh",
     "agents/*.md",
     "skills/**/*.md",
+    "claude/chat-formatting.md",
     "examples/config.toml",
     "legal/LICENSES.md",
     "legal/THIRD_PARTY_NOTICES.md",
@@ -65,9 +66,9 @@
     "ws": "8.21.0"
   },
   "optionalDependencies": {
-    "@gkorepanov/ccodex-relay-darwin-arm64": "0.5.0-rc.2",
-    "@gkorepanov/ccodex-relay-linux-arm64-gnu": "0.5.0-rc.2",
-    "@gkorepanov/ccodex-relay-linux-x64-gnu": "0.5.0-rc.2"
+    "@gkorepanov/ccodex-relay-darwin-arm64": "0.5.0-rc.21",
+    "@gkorepanov/ccodex-relay-linux-arm64-gnu": "0.5.0-rc.21",
+    "@gkorepanov/ccodex-relay-linux-x64-gnu": "0.5.0-rc.21"
   },
   "devDependencies": {
     "@openai/codex": "0.156.0",

package/scripts/migrate-0.4-to-0.5.mjs

@@ -2,17 +2,18 @@
 // One-off migration of CCodex 0.4 state (state.sqlite + handoffs.sqlite) to 0.5's meta.json. `ccodex setup` runs it
 // once, before it activates 0.5 (0.4's state.sqlite is there, meta.json is not). `--dry-run` only prints what it would do.
 //
-// - Every 0.4 Claude thread keeps its id: meta.lineages[<0.4 id>] = [{ claude, <session id> }].
-// - Provider-switch lineages become segment lists; forks whose 0.4 id was no backend move to their current backend.
+// - 0.4 thread ids go: a Claude thread is listed under its Claude session id, a provider-switch lineage (a segment
+//   list) under its first segment, a fork whose 0.4 id was no backend under its current backend.
+// - 0.4 side chats (/btw, full Claude forks) are no chats: their sessions are archived, without a 0.4 id.
 // - Archive flags, sections and section order of Claude threads carry over; names go into the transcripts.
 // - Claude threads whose transcript Claude's cleanup deleted (cleanupPeriodDays, 30 by default) get one back from the
 //   0.4 turns: prompts and answers as text, without tool calls, reasoning or compactions. Claude resumes it as such.
 // - A lineage is archived when its current backend was (0.4 archived sealed stock backends to hide them); 0.5 reads
 //   the flag from the row's backend, so that one is set to match, stock ones through `codex app-server`.
-// SQLite files are only read. meta.json is backed up before it is replaced.
+// SQLite files are only read, then moved to ~/.ccodex.0.4-backup. meta.json is backed up before it is replaced.
 import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { appendFileSync, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, utimesSync, writeFileSync } from "node:fs";
+import { appendFileSync, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, utimesSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { createInterface } from "node:readline";
@@ -51,13 +52,14 @@ const claudeThreads = new Map(state.prepare(`select id, claude_session_id, archi
   json_extract(thread_json, '$.parentThreadId') parent, json_extract(thread_json, '$.name') name,
   json_extract(thread_json, '$.section') section, json_extract(thread_json, '$.sectionEnteredAt') section_entered_at
   from threads`).all().map((row) => [row.id, row]));
+const sides = new Set(handoffs?.prepare("select public_thread_id from side_threads").all().map((row) => row.public_thread_id));
 
 // A turn's last record takes the uuid 0.4 kept for it, so provider-switch segments still end at that turn.
 for (const thread of state.prepare(`select id, claude_session_id, cwd, claude_code_version, coalesce(resolved_model, claude_model_value) model
   from threads where claude_session_id is not null and deletion_pending = 0
   and json_extract(thread_json, '$.parentThreadId') is null`).all()) {
   const sessionId = thread.claude_session_id;
-  if (transcripts.has(sessionId)) continue;
+  if (transcripts.has(sessionId) || sides.has(thread.id)) continue;
   const lines = [];
   let parentUuid = null;
   let at = 0;
@@ -70,13 +72,13 @@ for (const thread of state.prepare(`select id, claude_session_id, cwd, claude_co
   };
   for (const row of state.prepare("select turn_json, last_claude_message_uuid last from turns where thread_id = ? order by ordinal").all(thread.id)) {
     const turn = JSON.parse(row.turn_json);
-    const messageId = `msg_${randomUUID().replaceAll("-", "")}`;
     const start = lines.length;
     for (const item of turn.items) {
       if (item.type === "userMessage") {
         add({ type: "user", message: { role: "user", content: item.content.map((part) => part.text).join("\n") } }, turn.startedAt);
       } else if (item.type === "agentMessage" && item.text) {
-        add({ type: "assistant", message: { id: messageId, type: "message", role: "assistant", model: thread.model,
+        // Each message its own API message: one shared id would group them across the turn's steers.
+        add({ type: "assistant", message: { id: `msg_${randomUUID().replaceAll("-", "")}`, type: "message", role: "assistant", model: thread.model,
           content: [{ type: "text", text: item.text }], stop_reason: "end_turn", usage: { input_tokens: 0, output_tokens: 0 } } }, turn.completedAt ?? turn.startedAt);
       }
     }
@@ -102,6 +104,8 @@ function claudeTurnId(threadId, turnId) {
 }
 
 const lineages = {};
+/** 0.4 public id → the id 0.5 lists its lineage under. */
+const publicIds = new Map();
 const lineageBackends = new Set();
 let skipped = 0;
 if (handoffs) {
@@ -127,12 +131,13 @@ if (handoffs) {
         lastTurnId: last || !end ? null : claudeTurnId(epoch.backend_thread_id, end),
       };
     });
-    // 0.5 names a fork by its current backend; a lineage started from a thread keeps that thread's id.
+    // 0.5 names a fork by its current backend; a lineage started from a thread goes by that thread's backend.
     // Stock never lists threads without a user message of their own (0.4 made such forks); those take the current id.
     const unlisted = segments[0].provider === "codex"
       && stock.prepare("select first_user_message from threads where id = ?").get(segments[0].threadId)?.first_user_message === "";
-    const publicId = parts[0].epoch.backend_thread_id === task.public_thread_id && !unlisted ? task.public_thread_id : segments.at(-1).threadId;
-    if (publicId !== task.public_thread_id) log(`${unlisted ? "unlisted" : "fork"} ${task.public_thread_id} is now ${publicId}`);
+    const publicId = parts[0].epoch.backend_thread_id === task.public_thread_id && !unlisted ? segments[0].threadId : segments.at(-1).threadId;
+    if (publicId !== segments[0].threadId) log(`${unlisted ? "unlisted" : "fork"} ${task.public_thread_id} is now ${publicId}`);
+    publicIds.set(task.public_thread_id, publicId);
     if (segments.length === 1 && segments[0].threadId === publicId) continue;
     lineages[publicId] = segments;
   }
@@ -144,8 +149,9 @@ const named = [];
 for (const thread of claudeThreads.values()) {
   const sessionId = thread.claude_session_id;
   if (thread.deletion_pending || thread.parent || !transcripts.has(sessionId)) continue;
-  if (!lineages[thread.id] && !lineageBackends.has(thread.id) && thread.id !== sessionId) {
-    lineages[thread.id] = [{ provider: "claude", threadId: sessionId, lastTurnId: null }];
+  if (sides.has(thread.id)) {
+    archived.add(sessionId);
+    continue;
   }
   if (thread.archived) archived.add(sessionId);
   if (thread.section) sections[sessionId] = { sectionId: JSON.parse(thread.section).id, enteredAt: thread.section_entered_at ?? thread.updated_at };
@@ -165,7 +171,7 @@ for (const { backend_thread_id: id } of handoffs?.prepare("select backend_thread
 
 const archived04 = new Set([...claudeThreads.values()].filter((thread) => thread.archived).map((thread) => thread.claude_session_id));
 for (const [publicId, segments] of Object.entries(lineages)) {
-  const row = segments.find((segment) => segment.threadId === publicId) ?? segments[0];
+  const row = segments.find((segment) => segment.threadId === publicId);
   const isArchived = (segment) => segment.provider === "codex"
     ? stock.prepare("select archived from threads where id = ?").get(segment.threadId)?.archived === 1
     : archived04.has(segment.threadId);
@@ -200,11 +206,9 @@ async function stockRequests(requests) {
   child.kill();
 }
 
-/** A 0.4 id as 0.5 lists it (the row's backend). */
+/** A 0.4 id as 0.5 lists it. */
 function rowId(id) {
-  const segments = lineages[id];
-  if (segments) return (segments.find((segment) => segment.threadId === id) ?? segments[0]).threadId;
-  return claudeThreads.get(id)?.claude_session_id ?? id;
+  return publicIds.get(id) ?? claudeThreads.get(id)?.claude_session_id ?? id;
 }
 // Older 0.4 states predate section orders.
 const sectionOrders = state.prepare("select 1 from sqlite_master where type = 'table' and name = 'section_orders'").get()
@@ -217,11 +221,9 @@ const meta = {
   archived: [...new Set([...archived, ...(existing.archived ?? [])])],
   sections: { ...sections, ...existing.sections },
   sectionOrder: { ...sectionOrder, ...existing.sectionOrder },
-  leaves: existing.leaves ?? {},
 };
 
-const aliases = Object.values(lineages).filter((segments) => segments.length === 1).length;
-log(`lineages: ${Object.keys(lineages).length} (${aliases} kept 0.4 Claude ids, ${Object.keys(lineages).length - aliases} provider switches), skipped ${skipped}`);
+log(`lineages: ${Object.keys(lineages).length}, skipped ${skipped}`);
 log(`restored transcripts: ${restored.size}`);
 log(`archived: ${archived.size}, stock archive changes: ${stockArchives.length}, in sections: ${Object.keys(sections).length}, section orders: ${Object.keys(sectionOrder).length}, names to write: ${named.length}`);
 if (dryRun) {
@@ -240,4 +242,13 @@ for (const { sessionId, name } of named) {
 }
 // Claude lists sessions by their file's time: a restored one keeps its place.
 for (const [sessionId, { at }] of restored) utimesSync(transcripts.get(sessionId), at, at);
+// 0.4's databases go out of the way: nothing reads them, and setup migrates only while state.sqlite is there.
+state.close();
+handoffs?.close();
+const backup = `${home}.0.4-backup`;
+mkdirSync(backup, { recursive: true, mode: 0o700 });
+for (const name of readdirSync(stateDir).filter((name) => /^(state|handoffs)\.sqlite|^backups$|^cursor\.key$/.test(name))) {
+  renameSync(join(stateDir, name), join(backup, name));
+}
+log(`moved 0.4's databases to ${backup}`);
 log(`wrote ${metaPath}. Restart the gateway: codex app-server daemon restart`);