@12ui/design 0.2.91 → 0.2.93

package/dist/branch-local-plan.js

@@ -0,0 +1,282 @@
+import { spawn } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import { mkdir, open, readFile, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { BRANCH_PLANNER_SYSTEM_PROMPT, BUILD_PLAN_MODEL, branchPlanResponseSchema, buildBranchPlannerPrompt, } from './branch-core/index.js';
+import { waitForUnrecordedCall } from './branch-local-call-wait.js';
+import { resolveCodexBinary } from './codex-binary.js';
+/**
+ * The branch planner on the person's own Codex: the hosted planner call
+ * (workers/api/src/create/buildPlan.ts `deriveBuildPlan`) made as one
+ * `codex exec` turn. Same model and effort (gpt-6.1-sol, low), the same system
+ * text (as Codex's developer instructions), the same prompt on stdin, the same
+ * strict `create_branch_plan` schema as `--output-schema`, and the approved
+ * design as its one image. Tools are off, the sandbox is read-only, the sign-in
+ * is ChatGPT only, and the child gets an allowlisted environment, so no provider
+ * key reaches it.
+ *
+ * Each attempt is one call in the run-store under a stable id
+ * (`branch-plan:<run>:<attempt>`): its request, prompt, system text, schema and
+ * image are written into the call's own folder before it runs, and its events,
+ * stderr and final answer are written by the Codex process itself (file
+ * descriptors, a detached process group), so a `branch execute` that dies
+ * mid-plan leaves the call able to finish and a resume reads its answer instead
+ * of planning again. A call that ended without a usable answer is never
+ * dispatched again.
+ */
+export const BRANCH_PLAN_EFFORT = 'low';
+/** One planner turn may run this long before its process group is stopped. */
+export const BRANCH_PLAN_TIMEOUT_MS = 10 * 60_000;
+export const branchPlanCallId = (runId, attempt) => `branch-plan:${runId}:${attempt}`;
+const importRuntime = async () => {
+    const base = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'runtime', 'codex-conversion', 'src');
+    const load = async (file) => await import(pathToFileURL(path.join(base, file)).href);
+    const modules = await Promise.all(['run-store.mjs', 'codex/home.mjs', 'codex/caller-home.mjs', 'codex/arguments.mjs'].map(load));
+    return Object.assign({}, ...modules);
+};
+const sha256 = (value) => createHash('sha256').update(value).digest('hex');
+const extensionOf = (mediaType) => (mediaType === 'image/jpeg' ? 'jpg' : mediaType === 'image/webp' ? 'webp' : 'png');
+/** The `codex exec` argv of one planner turn. Every value is ours; nothing the person typed is in it. */
+export const branchPlannerArgv = (spec) => [
+    '-a', 'never', 'exec', '--ignore-user-config', '--ignore-rules', '--strict-config', '-C', spec.workDir,
+    '--skip-git-repo-check', '-s', 'read-only', '-m', BUILD_PLAN_MODEL,
+    '-c', `model_reasoning_effort="${BRANCH_PLAN_EFFORT}"`, '-c', 'model_provider="openai"',
+    '-c', 'forced_login_method="chatgpt"', '-c', 'project_doc_max_bytes=0',
+    // The hosted system message, as Codex's developer instructions (a TOML basic string).
+    '-c', `developer_instructions=${JSON.stringify(BRANCH_PLANNER_SYSTEM_PROMPT)}`,
+    ...(spec.serviceTier ? ['-c', `service_tier="${spec.serviceTier}"`] : []),
+    '--enable', 'skip_host_skill_discovery',
+    ...spec.disabledFeatures.flatMap((feature) => ['--disable', feature]),
+    '--json', '--color', 'never', '--output-last-message', spec.finalPath,
+    '--image', spec.imagePath, '--output-schema', spec.schemaPath, '-',
+];
+const readEvents = async (file) => {
+    const text = await readFile(file, 'utf8').catch(() => '');
+    const events = { threadId: null, completed: 0, failed: 0, tools: [], malformed: 0 };
+    for (const line of text.split('\n')) {
+        if (!line.trim())
+            continue;
+        let event;
+        try {
+            event = JSON.parse(line);
+        }
+        catch {
+            events.malformed += 1;
+            continue;
+        }
+        if (event.type === 'thread.started' && typeof event.thread_id === 'string')
+            events.threadId ??= event.thread_id;
+        if (event.type === 'turn.completed')
+            events.completed += 1;
+        if (event.type === 'turn.failed')
+            events.failed += 1;
+        if (event.type === 'item.completed' && event.item && !['agent_message', 'reasoning', 'error'].includes(event.item.type)) {
+            events.tools.push(String(event.item.type));
+        }
+    }
+    return events;
+};
+/** The model and effort the call's own session recorded, from its rollout in the Codex home. */
+const auditTurn = async (runtime, home, threadId, times) => {
+    const files = await runtime.callRollouts(home, threadId, times);
+    if (files.length === 0)
+        return null;
+    let model = null;
+    let effort = null;
+    let tools = 0;
+    for (const file of files) {
+        for (const line of (await readFile(file, 'utf8')).split('\n')) {
+            if (!line.trim())
+                continue;
+            let entry;
+            try {
+                entry = JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+            const payload = entry.payload ?? {};
+            if (entry.type === 'turn_context') {
+                model = payload.model ?? null;
+                effort = payload.effort ?? null;
+            }
+            if (['custom_tool_call', 'function_call'].includes(payload.type))
+                tools += 1;
+        }
+    }
+    return { model, effort, tools };
+};
+const pgidAlive = (pgid) => {
+    if (!pgid || !Number.isInteger(pgid) || pgid <= 0)
+        return false;
+    try {
+        process.kill(-pgid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code === 'EPERM';
+    }
+};
+/** A call whose process outlived the `branch execute` that started it is waited for, never run twice. */
+export const waitForProcessGroup = async (pgid, timeoutMs, pollMs = 1_000) => {
+    const deadline = Date.now() + timeoutMs;
+    while (pgidAlive(pgid) && Date.now() < deadline) {
+        await new Promise((resolve) => { setTimeout(resolve, pollMs); });
+    }
+};
+/** The answer a finished call left in its folder, when its events prove a completed, tool-free turn. */
+const finishedAnswer = async (callDir) => {
+    const [events, bytes] = await Promise.all([
+        readEvents(path.join(callDir, 'events.jsonl')),
+        readFile(path.join(callDir, 'final.txt')).catch(() => null),
+    ]);
+    if (!bytes || bytes.length === 0 || events.completed !== 1 || events.failed > 0 || events.tools.length > 0)
+        return null;
+    return bytes;
+};
+/** What shows a planner turn is over (its child writes its events and answer file itself): an answer, or a failed turn. */
+const planCallOver = async (callDir) => {
+    if (await finishedAnswer(callDir))
+        return 'answer';
+    return (await readEvents(path.join(callDir, 'events.jsonl'))).failed > 0 ? 'turn-failed' : null;
+};
+/**
+ * One planner attempt. Throws the store's `NEEDS_RECONCILIATION` when a call
+ * that was dispatched ended without a usable answer (never re-dispatched), and
+ * any other error when Codex could not be started at all (nothing was sent, so
+ * a resume may try the same call again).
+ */
+export const runBranchPlanCall = async (call) => {
+    const runtime = await importRuntime();
+    const store = runtime.createStore(call.root);
+    const binary = resolveCodexBinary(call.env);
+    const prompt = buildBranchPlannerPrompt({
+        concept: call.concept,
+        ...(call.maxScreens === undefined ? {} : { maxScreens: call.maxScreens }),
+        ...(call.scope === undefined ? {} : { scope: call.scope }),
+    });
+    const schema = JSON.stringify(branchPlanResponseSchema().schema);
+    const callId = branchPlanCallId(call.runId, call.attempt);
+    const timeoutMs = call.timeoutMs ?? BRANCH_PLAN_TIMEOUT_MS;
+    const request = {
+        kind: 'branch-plan',
+        model: BUILD_PLAN_MODEL,
+        effort: BRANCH_PLAN_EFFORT,
+        attempt: call.attempt,
+        systemSha256: sha256(BRANCH_PLANNER_SYSTEM_PROMPT),
+        promptSha256: sha256(prompt),
+        schemaSha256: sha256(schema),
+        winnerSha256: call.winner.sha256,
+    };
+    let home = null;
+    const result = await store.runCall(callId, request, async ({ callDir, persistMetadata }) => {
+        const workDir = path.join(callDir, 'work');
+        await mkdir(workDir, { recursive: true });
+        const finalPath = path.join(callDir, 'final.txt');
+        const schemaPath = path.join(callDir, 'schema.json');
+        const imagePath = path.join(callDir, `design.${extensionOf(call.winner.mediaType)}`);
+        // The exact words, schema and image this call sends, kept with it.
+        await Promise.all([
+            writeFile(path.join(callDir, 'system.txt'), BRANCH_PLANNER_SYSTEM_PROMPT, { flag: 'wx' }),
+            writeFile(path.join(callDir, 'prompt.txt'), prompt, { flag: 'wx' }),
+            writeFile(schemaPath, schema, { flag: 'wx' }),
+            writeFile(imagePath, call.winner.bytes, { flag: 'wx' }),
+        ]);
+        const argv = branchPlannerArgv({ workDir, finalPath, schemaPath, imagePath, disabledFeatures: runtime.disabledFeatures, serviceTier: home.serviceTier });
+        const startedAt = new Date().toISOString();
+        const invocation = { model: BUILD_PLAN_MODEL, effort: BRANCH_PLAN_EFFORT, authentication: 'chatgpt', noTools: true, home: home.home, envHome: home.envHome, argv, startedAt };
+        await writeFile(path.join(callDir, 'invocation.json'), `${JSON.stringify(invocation, null, 2)}\n`, { flag: 'wx' });
+        const stdout = await open(path.join(callDir, 'events.jsonl'), 'wx');
+        const stderr = await open(path.join(callDir, 'stderr.log'), 'wx');
+        let exit;
+        let timedOut = false;
+        try {
+            const child = spawn(binary, argv, { cwd: workDir, env: runtime.subscriptionEnv(home.envHome), detached: true, stdio: ['pipe', stdout.fd, stderr.fd] });
+            const stop = (signal) => {
+                if (!child.pid)
+                    return;
+                try {
+                    process.kill(-child.pid, signal);
+                }
+                catch (error) {
+                    if (!['ESRCH', 'EPERM'].includes(error.code ?? ''))
+                        throw error;
+                }
+            };
+            let killTimer;
+            const terminate = () => { stop('SIGTERM'); killTimer = setTimeout(() => stop('SIGKILL'), 5_000); };
+            const timer = setTimeout(() => { timedOut = true; terminate(); }, timeoutMs);
+            const interruptible = call.processOptions?.interruptOnSignal !== false;
+            if (interruptible) {
+                process.once('SIGINT', terminate);
+                process.once('SIGTERM', terminate);
+            }
+            const closed = new Promise((resolve) => {
+                child.once('error', (error) => { resolve({ exitCode: null, signal: null, spawnError: String(error) }); });
+                child.once('close', (exitCode, signal) => { resolve({ exitCode, signal, spawnError: null }); });
+            });
+            child.stdin?.on('error', () => undefined);
+            child.stdin?.end(prompt);
+            if (child.pid) {
+                await persistMetadata({ ...invocation, pgid: child.pid });
+                try {
+                    await call.processOptions?.onSpawn?.({ pgid: child.pid, callDir });
+                }
+                catch { /* bookkeeping only */ }
+            }
+            exit = await closed;
+            clearTimeout(timer);
+            clearTimeout(killTimer);
+            if (interruptible) {
+                process.removeListener('SIGINT', terminate);
+                process.removeListener('SIGTERM', terminate);
+            }
+            if (child.pid) {
+                try {
+                    await call.processOptions?.onExit?.({ pgid: child.pid });
+                }
+                catch { /* bookkeeping only */ }
+            }
+        }
+        finally {
+            await stdout.sync().catch(() => undefined);
+            await stderr.sync().catch(() => undefined);
+            await stdout.close();
+            await stderr.close();
+        }
+        const events = await readEvents(path.join(callDir, 'events.jsonl'));
+        const finishedAt = new Date().toISOString();
+        const audit = await auditTurn(runtime, home.home, events.threadId, [startedAt, finishedAt]);
+        const bytes = await readFile(finalPath).catch(() => null);
+        const completion = { ...exit, timedOut, threadId: events.threadId, events, audit, finalSha256: bytes ? sha256(bytes) : null, finishedAt };
+        await writeFile(path.join(callDir, 'completion.json'), `${JSON.stringify(completion, null, 2)}\n`, { flag: 'wx' });
+        if (exit.exitCode !== 0 || exit.signal || exit.spawnError || timedOut)
+            throw new Error('The planner turn did not complete.');
+        if (!bytes || bytes.length === 0 || events.completed !== 1 || events.failed > 0 || events.tools.length > 0 || events.malformed > 0) {
+            throw new Error('The planner turn broke the one-answer, no-tool protocol.');
+        }
+        if (!audit || audit.model !== BUILD_PLAN_MODEL || audit.effort !== BRANCH_PLAN_EFFORT || audit.tools > 0) {
+            throw new Error(`The planner turn's session does not prove ${BUILD_PLAN_MODEL} at ${BRANCH_PLAN_EFFORT} effort with no tools.`);
+        }
+        return { bytes, metadata: { ...invocation, pgid: null, threadId: events.threadId, audit, finishedAt } };
+    }, {
+        // Readiness for THIS call, before anything is sent: a failure here leaves the call unsent and resumable.
+        prepare: async () => {
+            home = await runtime.prepareCallerHome({ callerHome: call.env.CODEX_HOME?.trim() || null, binary, model: BUILD_PLAN_MODEL });
+        },
+        // A call dispatched by an earlier process: wait out its process group, then read the answer it left. A process that
+        // died between the spawn and recording the group left nothing to wait on: the call may still be running, so its
+        // answer is awaited until it lands, its turn fails, or the call's window closes (branch-local-call-wait.ts).
+        recover: async ({ callDir, metadata }) => {
+            if (metadata?.pgid)
+                await waitForProcessGroup(metadata.pgid, timeoutMs);
+            else
+                await waitForUnrecordedCall({ callDir, timeoutMs, finished: async () => planCallOver(callDir) });
+            const bytes = await finishedAnswer(callDir);
+            return bytes ? { bytes, metadata: { ...metadata, pgid: null, recovered: true } } : null;
+        },
+    });
+    return { raw: result.bytes.toString('utf8'), reused: result.reused, callId };
+};
+//# sourceMappingURL=branch-local-plan.js.map

package/dist/branch-local-plan.js.map

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

package/dist/branch-local-session-adoption.d.ts

@@ -0,0 +1,35 @@
+export declare const SESSION_SEARCH_FILE = "session-search.json";
+export type SessionSearch = {
+    callId: string;
+    searchedAt: string;
+    /**
+     * `matched`: exactly one session matched and its thread id now drives the store's recovery, which adopts its image
+     * (or, for a session without one, settles the call as it settles any call that drew nothing).
+     */
+    outcome: 'matched' | 'no-match' | 'ambiguous' | 'unverifiable-references';
+    window: {
+        from: string;
+        to: string;
+    };
+    home: string;
+    /** Session files written inside the window that were read. */
+    examined: number;
+    matches: Array<{
+        file: string;
+        sha256: string;
+        threadId: string | null;
+    }>;
+    threadId?: string;
+};
+/**
+ * The session files that carry the inputs of a dispatched call whose thread id was never announced, read only (no
+ * record, no adoption): what a resume watches while such a call may still be drawing (branch-local-call-wait.ts).
+ */
+export declare const unannouncedSessionFiles: (callDir: string, now?: () => number) => Promise<string[]>;
+/**
+ * Searches for the session of one dispatched image call that never recorded its thread id, and adopts it when exactly
+ * one matches (its thread id is written into the call's state). Null when there is nothing to search: no call, a call
+ * already settled, one the store cannot recover (no home recorded), or one whose thread id the store already knows.
+ */
+export declare const adoptUnannouncedSession: (callDir: string, now?: () => number) => Promise<SessionSearch | null>;
+//# sourceMappingURL=branch-local-session-adoption.d.ts.map

package/dist/branch-local-session-adoption.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"branch-local-session-adoption.d.ts","sourceRoot":"","sources":["../src/branch-local-session-adoption.ts"],"names":[],"mappings":"AA2CA,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AAEzD,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,OAAO,EAAE,SAAS,GAAG,UAAU,GAAG,WAAW,GAAG,yBAAyB,CAAC;IAC1E,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AA0IF;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAAU,SAAS,MAAM,EAAE,MAAK,MAAM,MAAiB,KAAG,OAAO,CAAC,MAAM,EAAE,CAE7G,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAU,SAAS,MAAM,EAAE,MAAK,MAAM,MAAiB,KAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAqBzH,CAAC"}

package/dist/branch-local-session-adoption.js

@@ -0,0 +1,185 @@
+import { createHash } from 'node:crypto';
+import { readdir, readFile, stat } from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+const importRuntime = async () => {
+    const base = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'runtime', 'codex-conversion', 'src');
+    const load = async (file) => await import(pathToFileURL(path.join(base, file)).href);
+    const modules = await Promise.all(['run-store-io.mjs', 'codex/caller-home.mjs', 'images/native-records.mjs', 'images/native.mjs'].map(load));
+    return Object.assign({}, ...modules);
+};
+export const SESSION_SEARCH_FILE = 'session-search.json';
+const sha256 = (bytes) => createHash('sha256').update(bytes).digest('hex');
+/**
+ * The day folders (`sessions/YYYY/MM/DD`, local and UTC) the store's recovery looks in for a call's session (Codex
+ * files a session under the day it started): the call's dispatch day and today's.
+ */
+const dayDirectories = (home, from, to) => {
+    const pad = (value) => String(value).padStart(2, '0');
+    const days = new Set();
+    for (const date of [new Date(from), new Date(to)]) {
+        days.add(path.join(home, 'sessions', String(date.getFullYear()), pad(date.getMonth() + 1), pad(date.getDate())));
+        days.add(path.join(home, 'sessions', String(date.getUTCFullYear()), pad(date.getUTCMonth() + 1), pad(date.getUTCDate())));
+    }
+    return [...days];
+};
+/** The call's attached images in attach order (`reference.<ext>`, `reference-<n>.<ext>`), only when each is the digest its request names. */
+const verifiedReferences = async (callDir, digests) => {
+    if (!Array.isArray(digests) || digests.length === 0)
+        return null;
+    const byIndex = new Map();
+    for (const name of await readdir(callDir)) {
+        const match = /^reference(?:-(\d+))?\.(?:png|jpg|webp|gif)$/u.exec(name);
+        if (match)
+            byIndex.set(match[1] ? Number(match[1]) : 1, path.join(callDir, name));
+    }
+    if (byIndex.size !== digests.length)
+        return null;
+    const files = [];
+    for (let index = 1; index <= digests.length; index += 1) {
+        const file = byIndex.get(index);
+        if (!file || sha256(await readFile(file)) !== digests[index - 1])
+            return null;
+        files.push(file);
+    }
+    return files;
+};
+/** Every string value in a parsed record, however deep (a session's messages and tool inputs). */
+const stringsOf = (value, into = []) => {
+    if (typeof value === 'string')
+        into.push(value);
+    else if (Array.isArray(value))
+        for (const entry of value)
+            stringsOf(entry, into);
+    else if (value && typeof value === 'object')
+        for (const entry of Object.values(value))
+            stringsOf(entry, into);
+    return into;
+};
+/** The path as it can appear in a session: raw, or escaped inside one or two levels of JSON string. */
+const pathSpellings = (file) => {
+    const once = JSON.stringify(file).slice(1, -1);
+    return [...new Set([file, once, JSON.stringify(once).slice(1, -1)])];
+};
+const sessionMatches = (runtime, text, references, prompt, wrapper) => {
+    if (!references.every((file) => pathSpellings(file).some((spelling) => text.includes(spelling))))
+        return false;
+    let literals = [];
+    try {
+        literals = runtime.parseNativeRecords(text).calls.flatMap((call) => call.prompts ?? []);
+    }
+    catch {
+        literals = [];
+    }
+    if (literals.includes(prompt))
+        return true;
+    for (const line of text.split('\n')) {
+        if (!line.includes('IMAGE PROMPT'))
+            continue;
+        try {
+            if (stringsOf(JSON.parse(line)).some((value) => value.includes(wrapper)))
+                return true;
+        }
+        catch { /* a malformed line is the collector's to report */ }
+    }
+    return false;
+};
+/** The thread id a session file is named by, confirmed by the session's own id when it records one. */
+const threadIdOfSession = (file, text) => {
+    const name = path.basename(file);
+    const firstLine = text.slice(0, text.indexOf('\n') === -1 ? text.length : text.indexOf('\n'));
+    try {
+        const record = JSON.parse(firstLine);
+        const id = record.type === 'session_meta' && typeof record.payload?.id === 'string' ? record.payload.id : null;
+        if (id && name.endsWith(`-${id}.jsonl`))
+            return id;
+    }
+    catch { /* fall back to the name */ }
+    return /^rollout-\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-(.+)\.jsonl$/u.exec(name)?.[1] ?? null;
+};
+/** The sessions in the call's Codex home that carry the call's own inputs; null when there is nothing to search. */
+const searchSessions = async (callDir, now) => {
+    const runtime = await importRuntime();
+    const statePath = path.join(callDir, 'state.json');
+    const state = await runtime.readJson(statePath);
+    const metadata = state?.metadata;
+    if (!state || state.status !== 'dispatched' || typeof metadata?.home !== 'string' || typeof metadata.startedAt !== 'string')
+        return null;
+    if (typeof metadata.threadId === 'string' || await runtime.threadIdOf(path.join(callDir, 'events.jsonl')))
+        return null;
+    const request = await runtime.readJson(path.join(callDir, 'request.json'));
+    if (!request || runtime.hash(runtime.canonical(request)) !== state.requestHash || typeof request.prompt !== 'string')
+        return null;
+    const home = metadata.home;
+    const from = Date.parse(metadata.startedAt);
+    if (Number.isNaN(from))
+        return null;
+    const to = now();
+    const base = { callId: String(state.id), searchedAt: new Date(to).toISOString(), window: { from: metadata.startedAt, to: new Date(to).toISOString() }, home };
+    const found = { runtime, state, metadata: metadata, statePath, base, examined: 0, matches: [] };
+    const references = await verifiedReferences(callDir, request.inputSha256);
+    if (!references)
+        return { ...found, references: null };
+    const wrapper = runtime.nativeCallPrompt(references, request.prompt).trimEnd();
+    for (const directory of dayDirectories(home, from, to)) {
+        let names;
+        try {
+            names = await readdir(directory);
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                continue;
+            throw error;
+        }
+        for (const name of names.filter((entry) => entry.startsWith('rollout-') && entry.endsWith('.jsonl')).sort()) {
+            const file = path.join(directory, name);
+            // Written inside the window (one second of slack for coarse file times): a session the call could have started.
+            const { mtimeMs } = await stat(file);
+            if (mtimeMs < from - 1_000 || mtimeMs > to + 1_000)
+                continue;
+            found.examined += 1;
+            const bytes = await readFile(file);
+            const text = bytes.toString('utf8');
+            if (sessionMatches(runtime, text, references, request.prompt, wrapper)) {
+                found.matches.push({ file, sha256: sha256(bytes), threadId: threadIdOfSession(file, text) });
+            }
+        }
+    }
+    return { ...found, references };
+};
+/**
+ * The session files that carry the inputs of a dispatched call whose thread id was never announced, read only (no
+ * record, no adoption): what a resume watches while such a call may still be drawing (branch-local-call-wait.ts).
+ */
+export const unannouncedSessionFiles = async (callDir, now = Date.now) => ((await searchSessions(callDir, now))?.matches.map((match) => match.file) ?? []);
+/**
+ * Searches for the session of one dispatched image call that never recorded its thread id, and adopts it when exactly
+ * one matches (its thread id is written into the call's state). Null when there is nothing to search: no call, a call
+ * already settled, one the store cannot recover (no home recorded), or one whose thread id the store already knows.
+ */
+export const adoptUnannouncedSession = async (callDir, now = Date.now) => {
+    const found = await searchSessions(callDir, now);
+    if (!found)
+        return null;
+    const { runtime, state, metadata, statePath, base, examined, matches } = found;
+    const record = async (search) => {
+        await runtime.writeJson(path.join(callDir, SESSION_SEARCH_FILE), search);
+        return search;
+    };
+    if (!found.references)
+        return record({ ...base, outcome: 'unverifiable-references', examined: 0, matches: [] });
+    if (matches.length !== 1)
+        return record({ ...base, outcome: matches.length ? 'ambiguous' : 'no-match', examined, matches });
+    const [match] = matches;
+    // The thread id must find this one session the way the store's recovery will look it up, or nothing is adopted.
+    const located = match.threadId ? await runtime.callRollouts(base.home, match.threadId, [metadata.startedAt, Date.parse(base.searchedAt)]) : [];
+    if (located.length !== 1 || located[0] !== match.file)
+        return record({ ...base, outcome: 'ambiguous', examined, matches });
+    const search = await record({ ...base, outcome: 'matched', examined, matches, threadId: match.threadId });
+    await runtime.writeJson(statePath, {
+        ...state,
+        metadata: { ...metadata, threadId: match.threadId, threadIdSource: { kind: 'session-search', file: match.file, sha256: match.sha256, searchedAt: search.searchedAt } },
+    });
+    return search;
+};
+//# sourceMappingURL=branch-local-session-adoption.js.map

package/dist/branch-local-session-adoption.js.map

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

package/dist/branch-materialize.d.ts

@@ -1,4 +1,4 @@
-import type { TwelveUiBranchClient } from './branch-client.js';
+import type { BranchRunClient } from './branch-client.js';
 import { type BranchDownloadedScreen } from './branch-downloads.js';
 import type { BranchExecutionInputs } from './branch-execution-types.js';
 /**
@@ -24,7 +24,7 @@ export type BranchRunMaterializer = {
     finish: () => Promise<void>;
 };
 export declare const createRunMaterializer: (args: {
-    client: TwelveUiBranchClient;
+    client: BranchRunClient;
     runId: string;
     inputs: BranchExecutionInputs;
     screensDirectory: string;

package/dist/branch-materialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-materialize.d.ts","sourceRoot":"","sources":["../src/branch-materialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAKL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEzE;;;;;;;;;GASG;AAEH,MAAM,MAAM,qBAAqB,GAAG;IAClC,0EAA0E;IAC1E,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACnF;;;;OAIG;IACH,MAAM,EAAE,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC9C,oEAAoE;IACpE,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,MAAM;IAC1C,MAAM,EAAE,oBAAoB,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,qBAAqB,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,KAAG,qBAqEH,CAAC"}
+{"version":3,"file":"branch-materialize.d.ts","sourceRoot":"","sources":["../src/branch-materialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAKL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEzE;;;;;;;;;GASG;AAEH,MAAM,MAAM,qBAAqB,GAAG;IAClC,0EAA0E;IAC1E,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACnF;;;;OAIG;IACH,MAAM,EAAE,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC9C,oEAAoE;IACpE,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,MAAM;IAC1C,MAAM,EAAE,eAAe,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,qBAAqB,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,KAAG,qBAqEH,CAAC"}

package/dist/branch-page-conversion.js

@@ -249,7 +249,7 @@ export const convertBranchPage = async (args) => {
     const branchAttempt = recovery && recoveryTarget
         ? {
             version: 1,
-            workflow_revision: BRANCH_WORKFLOW_REVISION,
+            workflow_revision: args.branchWorkflowRevision ?? BRANCH_WORKFLOW_REVISION,
             logical_run_id: args.plan.runId,
             logical_page_id: page.id,
             generation: recovery.generation,