superun-ai-cli 0.1.33 → 0.1.35

package/dist/interactions/draft-store.js

@@ -1,14 +1,17 @@
 /** 按环境和凭据隔离交互草稿，串行保存回答与创建进度。@author xiuyu.yi */
 import { createHash, randomUUID } from 'node:crypto';
 import { mkdir, open, readFile, rename, unlink } from 'node:fs/promises';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { join, resolve } from 'node:path';
+import { stateDirectory } from '../config/state-directory.js';
 import { CliError } from '../output/exit-codes.js';
+import { filesystemCode, stateOperation, withStateCleanup } from './state-storage.js';
 export const fingerprint = (value) => createHash('sha256').update(JSON.stringify(value)).digest('hex');
+// 同一进程同一目录只检查一次；实际操作仍处理权限变化与磁盘异常。
+const checkedDirectories = new Map();
 export class InteractionDraftStore {
     scope;
     root;
-    constructor(scope, root = join(homedir(), '.config/superun-ai-cli/interactions')) {
+    constructor(scope, root = stateDirectory('interactions')) {
         this.scope = scope;
         this.root = root;
     }
@@ -16,87 +19,177 @@ export class InteractionDraftStore {
         return join(this.root, this.scope, `${fingerprint(key)}.json`);
     }
     async read(key) {
+        const path = this.path(key);
+        const content = await stateOperation('read', path, async () => {
+            try {
+                return await readFile(path, 'utf8');
+            }
+            catch (error) {
+                if (filesystemCode(error) === 'ENOENT')
+                    return undefined;
+                throw error;
+            }
+        });
+        if (content === undefined)
+            return undefined;
         try {
-            return JSON.parse(await readFile(this.path(key), 'utf8'));
+            return JSON.parse(content);
         }
-        catch (error) {
-            if (error.code === 'ENOENT')
-                return undefined;
-            throw new CliError('PROTOCOL_ERROR', '交互草稿无法读取，请保留文件排查，勿重复创建');
+        catch {
+            throw new CliError('PROTOCOL_ERROR', '本地状态文件格式无效，请保留文件排查，勿重复创建', { path });
         }
     }
+    remove(path) {
+        return stateOperation('unlink', path, async () => {
+            try {
+                await unlink(path);
+            }
+            catch (error) {
+                if (filesystemCode(error) !== 'ENOENT')
+                    throw error;
+            }
+        });
+    }
+    close(file, path) {
+        return stateOperation('close', path, () => file.close());
+    }
+    async writeFile(path, content) {
+        const file = await stateOperation('create', path, () => open(path, 'wx', 0o600));
+        await withStateCleanup(async () => {
+            await stateOperation('write', path, () => file.writeFile(content));
+            await stateOperation('fsync', path, () => file.sync());
+        }, [() => this.close(file, path)]);
+    }
+    prepare() {
+        const directory = resolve(this.root, this.scope);
+        let checked = checkedDirectories.get(directory);
+        if (!checked) {
+            checked = this.checkDirectory(directory).catch((error) => {
+                checkedDirectories.delete(directory);
+                throw error;
+            });
+            checkedDirectories.set(directory, checked);
+        }
+        return checked;
+    }
+    async checkDirectory(directory) {
+        await stateOperation('mkdir', directory, () => mkdir(directory, { recursive: true, mode: 0o700 }));
+        const temp = join(directory, `.state-probe-${randomUUID()}.tmp`);
+        const target = `${temp}.ready`;
+        // 检查失败最多留下诊断文件，不能先创建真实业务锁；清理失败保留路径。
+        await withStateCleanup(async () => {
+            await this.writeFile(temp, '{}');
+            await stateOperation('rename', temp, () => rename(temp, target));
+            // 同时验证覆盖已存在文件的原子改名，避免首次绑定成功、后续更新才失败。
+            await this.writeFile(temp, '{}');
+            await stateOperation('rename', temp, () => rename(temp, target));
+        }, [() => this.remove(temp), () => this.remove(target)]);
+    }
     async write(key, value) {
-        await mkdir(join(this.root, this.scope), { recursive: true, mode: 0o700 });
+        await this.prepare();
         const path = this.path(key), temp = `${path}.${randomUUID()}.tmp`;
-        const file = await open(temp, 'wx', 0o600);
-        try {
-            await file.writeFile(JSON.stringify(value));
-            await file.sync();
-        }
-        finally {
-            await file.close();
-        }
-        await rename(temp, path);
+        await withStateCleanup(async () => {
+            await this.writeFile(temp, JSON.stringify(value));
+            await stateOperation('rename', temp, () => rename(temp, path));
+        }, [() => this.remove(temp)]);
     }
-    async locked(key, run) {
-        await mkdir(join(this.root, this.scope), { recursive: true, mode: 0o700 });
-        const path = `${this.path(key)}.lock`;
-        // 不回收无法确认归属的锁。已退出进程的遗留锁可在下一次操作恢复。
-        let lock;
-        try {
-            lock = await open(path, 'wx', 0o600);
-        }
-        catch (error) {
-            if (error.code !== 'EEXIST')
-                throw error;
-            // 遗留锁回收也必须互斥，避免两个恢复进程误删对方刚取得的新锁。
-            const recoveryPath = `${path}.recovery`;
-            let recovery;
+    async owner(path) {
+        const content = await stateOperation('read-lock', path, async () => {
             try {
-                recovery = await open(recoveryPath, 'wx', 0o600);
+                return await readFile(path, 'utf8');
             }
-            catch {
-                throw new CliError('AMBIGUOUS_INTERACTION', '交互锁正在恢复，请稍后查询状态');
+            catch (error) {
+                if (filesystemCode(error) === 'ENOENT')
+                    throw new CliError('LOCAL_STATE_LOCKED', '本地状态锁已变化，请重新查询状态', { path });
+                throw error;
             }
+        });
+        const pid = Number(content);
+        return Number.isSafeInteger(pid) && pid > 0 ? pid : undefined;
+    }
+    async alive(pid, path) {
+        return stateOperation('check-lock-owner', path, async () => {
             try {
-                let dead = false;
-                try {
-                    const pid = Number(await readFile(path, 'utf8'));
-                    if (Number.isInteger(pid) && pid > 0) {
-                        try {
-                            process.kill(pid, 0);
-                        }
-                        catch (cause) {
-                            dead = cause.code === 'ESRCH';
-                        }
-                    }
-                }
-                catch {
-                    /* 未写完的锁不能抢占。 */
-                }
-                if (!dead)
-                    throw new CliError('AMBIGUOUS_INTERACTION', '当前交互正在处理，请稍后查询状态');
-                await unlink(path);
+                process.kill(pid, 0);
+                return true;
+            }
+            catch (error) {
+                if (filesystemCode(error) === 'ESRCH')
+                    return false;
+                throw error;
+            }
+        });
+    }
+    recoveryRequired(path, lockPid) {
+        return new CliError('LOCAL_STATE_RECOVERY_REQUIRED', '本地状态锁无法安全自动回收；请先确认没有写入进程，再备份并恢复所列锁文件，不要反复重试或按文件年龄强制删除', { path, lockPid });
+    }
+    async locked(key, run) {
+        await this.prepare();
+        const path = `${this.path(key)}.lock`;
+        let lock;
+        const acquire = () => open(path, 'wx', 0o600);
+        return withStateCleanup(async () => {
+            // 恢复分支清理失败时，外层仍会释放刚取得的业务锁。
+            await stateOperation('acquire-lock', path, async () => {
                 try {
-                    lock = await open(path, 'wx', 0o600);
+                    lock = await acquire();
+                    return;
                 }
-                catch {
-                    throw new CliError('AMBIGUOUS_INTERACTION', '当前交互正在处理，请稍后查询状态');
+                catch (error) {
+                    if (filesystemCode(error) !== 'EEXIST')
+                        throw error;
                 }
-            }
-            finally {
-                await recovery.close();
-                await unlink(recoveryPath);
-            }
-        }
-        try {
-            await lock.writeFile(String(process.pid));
-            return await run();
-        }
-        finally {
-            await lock.close();
-            await unlink(path);
-        }
+                const recoveryPath = `${path}.recovery`;
+                const recovery = await stateOperation('acquire-recovery-lock', recoveryPath, async () => {
+                    try {
+                        return await open(recoveryPath, 'wx', 0o600);
+                    }
+                    catch (error) {
+                        if (filesystemCode(error) !== 'EEXIST')
+                            throw error;
+                        const pid = await this.owner(recoveryPath);
+                        if (pid !== undefined && (await this.alive(pid, recoveryPath)))
+                            throw new CliError('LOCAL_STATE_LOCKED', '本地状态锁正在恢复，请等待持有进程结束', {
+                                path: recoveryPath,
+                                lockPid: pid,
+                            });
+                        // 旧空锁或已退出恢复进程的锁无法凭年龄判断归属，必须显式维护。
+                        throw this.recoveryRequired(recoveryPath, pid);
+                    }
+                });
+                await withStateCleanup(async () => {
+                    await stateOperation('write-lock-owner', recoveryPath, () => recovery.writeFile(String(process.pid)));
+                    const pid = await this.owner(path);
+                    if (pid === undefined)
+                        throw this.recoveryRequired(path);
+                    if (await this.alive(pid, path))
+                        throw new CliError('LOCAL_STATE_LOCKED', '本地状态正在由其他进程更新，请等待该进程结束', {
+                            path,
+                            lockPid: pid,
+                        });
+                    await this.remove(path);
+                    try {
+                        lock = await acquire();
+                    }
+                    catch (error) {
+                        if (filesystemCode(error) !== 'EEXIST')
+                            throw error;
+                        throw new CliError('LOCAL_STATE_LOCKED', '其他进程已取得本地状态锁，请稍后查询', { path });
+                    }
+                }, [() => this.close(recovery, recoveryPath), () => this.remove(recoveryPath)]);
+            });
+            await stateOperation('write-lock-owner', path, () => lock.writeFile(String(process.pid)));
+            return run();
+        }, [
+            async () => {
+                if (lock)
+                    await this.close(lock, path);
+            },
+            async () => {
+                if (lock)
+                    await this.remove(path);
+            },
+        ]);
     }
 }
 //# sourceMappingURL=draft-store.js.map

package/dist/interactions/draft-store.js.map

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

package/dist/interactions/state-storage.d.ts

@@ -0,0 +1,4 @@
+export declare function filesystemCode(error: unknown): string | undefined;
+export declare function stateOperation<T>(operation: string, path: string, run: () => Promise<T>): Promise<T>;
+/** 所有清理均尝试执行；清理异常不能覆盖首次异常。 */
+export declare function withStateCleanup<T>(run: () => Promise<T>, cleanup: Array<() => Promise<unknown>>): Promise<T>;

package/dist/interactions/state-storage.js

@@ -0,0 +1,65 @@
+/** 保留状态操作与清理失败的诊断信息，不输出状态内容。@author xiuyu.yi */
+import { CliError } from '../output/exit-codes.js';
+export function filesystemCode(error) {
+    return error && typeof error === 'object' && 'code' in error && typeof error.code === 'string'
+        ? error.code
+        : undefined;
+}
+export async function stateOperation(operation, path, run) {
+    try {
+        return await run();
+    }
+    catch (error) {
+        if (error instanceof CliError)
+            throw error;
+        const code = filesystemCode(error);
+        const denied = code === 'EPERM' || code === 'EACCES';
+        throw new CliError(denied ? 'LOCAL_STATE_PERMISSION_DENIED' : 'LOCAL_STATE_IO_ERROR', denied
+            ? '本地状态目录权限不足，请检查所列路径的文件操作权限；不要重复提交业务请求'
+            : '本地状态文件操作失败，请根据操作和路径排查；不要重复提交业务请求', { filesystemCode: code, operation, path });
+    }
+}
+/** 所有清理均尝试执行；清理异常不能覆盖首次异常。 */
+export async function withStateCleanup(run, cleanup) {
+    let failed = false;
+    let primary;
+    let result;
+    try {
+        result = await run();
+    }
+    catch (error) {
+        failed = true;
+        primary = error;
+    }
+    const errors = [];
+    for (const clean of cleanup) {
+        try {
+            await clean();
+        }
+        catch (error) {
+            errors.push(error instanceof CliError ? error : new CliError('LOCAL_STATE_IO_ERROR', '本地状态清理失败'));
+        }
+    }
+    if (errors.length) {
+        const first = failed
+            ? primary instanceof CliError
+                ? primary
+                : new CliError('PROTOCOL_ERROR', '操作失败且本地状态清理失败，请保留现场排查')
+            : errors.shift();
+        throw new CliError(first.code, first.message, {
+            ...first.details,
+            ...(errors.length
+                ? {
+                    cleanupErrors: [
+                        ...(Array.isArray(first.details.cleanupErrors) ? first.details.cleanupErrors : []),
+                        ...errors.map((error) => ({ ...error.details, code: error.code })),
+                    ],
+                }
+                : {}),
+        });
+    }
+    if (failed)
+        throw primary;
+    return result;
+}
+//# sourceMappingURL=state-storage.js.map

package/dist/interactions/state-storage.js.map

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

package/dist/output/exit-codes.d.ts

@@ -12,6 +12,10 @@ export declare const EXIT_CODES: {
     readonly UNSUPPORTED_INTERACTION: 6;
     readonly LOCAL_WAIT_TIMEOUT: 7;
     readonly PROTOCOL_ERROR: 8;
+    readonly LOCAL_STATE_PERMISSION_DENIED: 9;
+    readonly LOCAL_STATE_IO_ERROR: 9;
+    readonly LOCAL_STATE_LOCKED: 9;
+    readonly LOCAL_STATE_RECOVERY_REQUIRED: 9;
     readonly INTERRUPTED: 130;
 };
 export type ErrorCode = keyof typeof EXIT_CODES;

package/dist/output/exit-codes.js

@@ -12,6 +12,10 @@ export const EXIT_CODES = {
     UNSUPPORTED_INTERACTION: 6,
     LOCAL_WAIT_TIMEOUT: 7,
     PROTOCOL_ERROR: 8,
+    LOCAL_STATE_PERMISSION_DENIED: 9,
+    LOCAL_STATE_IO_ERROR: 9,
+    LOCAL_STATE_LOCKED: 9,
+    LOCAL_STATE_RECOVERY_REQUIRED: 9,
     INTERRUPTED: 130,
 };
 export class CliError extends Error {

package/dist/output/exit-codes.js.map

@@ -1 +1 @@
-{"version":3,"file":"exit-codes.js","sourceRoot":"","sources":["../../src/output/exit-codes.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,gBAAgB,EAAE,CAAC;IACnB,aAAa,EAAE,CAAC;IAChB,eAAe,EAAE,CAAC;IAClB,aAAa,EAAE,CAAC;IAChB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,iBAAiB,EAAE,CAAC;IACpB,qBAAqB,EAAE,CAAC;IACxB,eAAe,EAAE,CAAC;IAClB,uBAAuB,EAAE,CAAC;IAC1B,kBAAkB,EAAE,CAAC;IACrB,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG;CACR,CAAC;AAIX,MAAM,OAAO,QAAS,SAAQ,KAAK;IAEtB;IAEA;IAHX,YACW,IAAe,EACxB,OAAe,EACN,UAAmC,EAAE;QAE9C,KAAK,CAAC,OAAO,CAAC,CAAC;QAJN,SAAI,GAAJ,IAAI,CAAW;QAEf,YAAO,GAAP,OAAO,CAA8B;QAG9C,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;CACF"}
+{"version":3,"file":"exit-codes.js","sourceRoot":"","sources":["../../src/output/exit-codes.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,gBAAgB,EAAE,CAAC;IACnB,aAAa,EAAE,CAAC;IAChB,eAAe,EAAE,CAAC;IAClB,aAAa,EAAE,CAAC;IAChB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,iBAAiB,EAAE,CAAC;IACpB,qBAAqB,EAAE,CAAC;IACxB,eAAe,EAAE,CAAC;IAClB,uBAAuB,EAAE,CAAC;IAC1B,kBAAkB,EAAE,CAAC;IACrB,cAAc,EAAE,CAAC;IACjB,6BAA6B,EAAE,CAAC;IAChC,oBAAoB,EAAE,CAAC;IACvB,kBAAkB,EAAE,CAAC;IACrB,6BAA6B,EAAE,CAAC;IAChC,WAAW,EAAE,GAAG;CACR,CAAC;AAIX,MAAM,OAAO,QAAS,SAAQ,KAAK;IAEtB;IAEA;IAHX,YACW,IAAe,EACxB,OAAe,EACN,UAAmC,EAAE;QAE9C,KAAK,CAAC,OAAO,CAAC,CAAC;QAJN,SAAI,GAAJ,IAAI,CAAW;QAEf,YAAO,GAAP,OAAO,CAA8B;QAG9C,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;CACF"}

package/dist/program.js

@@ -1,7 +1,7 @@
 /** 命令树与公共选项。@author xiuyu.yi */
 import { Command } from 'commander';
 import { COMMAND_NAME, PACKAGE_VERSION } from './config/constants.js';
-import { requireCredentials } from './commands/shared.js';
+import { requireCredentials, rememberExplicitSession } from './commands/shared.js';
 import { registerAuth } from './commands/auth/index.js';
 import { registerSession } from './commands/session/index.js';
 import { registerChat } from './commands/chat/index.js';
@@ -20,6 +20,8 @@ export function createProgram(context, hooks) {
         context.connection = undefined;
         context.sessionBinding = undefined;
         context.selectedSessionId = undefined;
+        context.selectionRequestedAt = new Date().toISOString();
+        context.rememberSession = undefined;
         const rootCommand = action.parent === program;
         const authCommand = action.parent?.name() === 'auth' && action.parent.parent === program;
         const offline = (rootCommand && (action.name() === 'version' || action.name() === 'update')) ||
@@ -29,6 +31,7 @@ export function createProgram(context, hooks) {
         await hooks.beforeBusiness();
         if (!(authCommand && action.name() === 'login'))
             await requireCredentials(context, action, !authCommand);
+        rememberExplicitSession(context, action);
     });
     registerAuth(program, context);
     registerSession(program, context);

package/dist/program.js.map

@@ -1 +1 @@
-{"version":3,"file":"program.js","sourceRoot":"","sources":["../src/program.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,UAAU,aAAa,CAC3B,OAAuB,EACvB,KAGC;IAED,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;SAC1B,IAAI,CAAC,YAAY,CAAC;SAClB,WAAW,CACV,iDAAiD,CAClD;SACA,OAAO,CAAC,eAAe,CAAC;SACxB,MAAM,CAAC,kBAAkB,EAAE,QAAQ,CAAC;SACpC,MAAM,CAAC,qBAAqB,EAAE,MAAM,EAAE,OAAO,CAAC;SAC9C,YAAY,EAAE;SACd,eAAe,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;IAClD,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAChD,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;QAC/B,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;QACnC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACtC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC;QACzF,MAAM,OAAO,GACX,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,QAAQ,CAAC,CAAC;YAC5E,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,QAAQ,CAAC,CAAC;QAC9C,IAAI,OAAO,IAAI,MAAM,KAAK,OAAO;YAAE,OAAO;QAC1C,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;QAC7B,IAAI,CAAC,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;YAAE,MAAM,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC;IAC3G,CAAC,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/B,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/B,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtD,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"program.js","sourceRoot":"","sources":["../src/program.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAEtE,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,UAAU,aAAa,CAC3B,OAAuB,EACvB,KAGC;IAED,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;SAC1B,IAAI,CAAC,YAAY,CAAC;SAClB,WAAW,CACV,iDAAiD,CAClD;SACA,OAAO,CAAC,eAAe,CAAC;SACxB,MAAM,CAAC,kBAAkB,EAAE,QAAQ,CAAC;SACpC,MAAM,CAAC,qBAAqB,EAAE,MAAM,EAAE,OAAO,CAAC;SAC9C,YAAY,EAAE;SACd,eAAe,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;IAClD,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAChD,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;QAC/B,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;QACnC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACtC,OAAO,CAAC,oBAAoB,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACxD,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;QACpC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC;QACzF,MAAM,OAAO,GACX,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,QAAQ,CAAC,CAAC;YAC5E,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,QAAQ,CAAC,CAAC;QAC9C,IAAI,OAAO,IAAI,MAAM,KAAK,OAAO;YAAE,OAAO;QAC1C,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;QAC7B,IAAI,CAAC,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;YAAE,MAAM,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC;QACzG,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/B,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/B,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtD,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/session/binding.d.ts

@@ -1,74 +1,27 @@
-import { z } from 'zod';
 import type { CreationRuntime } from '../runtime.js';
 import type { HostContext } from './host-context.js';
-declare const recordSchema: z.ZodEffects<z.ZodObject<{
-    version: z.ZodLiteral<1>;
-    revision: z.ZodString;
-    updatedAt: z.ZodString;
-    state: z.ZodEnum<["UNBOUND", "BOUND", "CREATING", "CREATE_FAILED", "CREATE_UNKNOWN"]>;
-    sessionId: z.ZodOptional<z.ZodString>;
-}, "strict", z.ZodTypeAny, {
-    version: 1;
-    revision: string;
-    updatedAt: string;
-    state: "UNBOUND" | "BOUND" | "CREATING" | "CREATE_FAILED" | "CREATE_UNKNOWN";
-    sessionId?: string | undefined;
-}, {
-    version: 1;
-    revision: string;
-    updatedAt: string;
-    state: "UNBOUND" | "BOUND" | "CREATING" | "CREATE_FAILED" | "CREATE_UNKNOWN";
-    sessionId?: string | undefined;
-}>, {
-    version: 1;
-    revision: string;
-    updatedAt: string;
-    state: "UNBOUND" | "BOUND" | "CREATING" | "CREATE_FAILED" | "CREATE_UNKNOWN";
-    sessionId?: string | undefined;
-}, {
-    version: 1;
-    revision: string;
-    updatedAt: string;
-    state: "UNBOUND" | "BOUND" | "CREATING" | "CREATE_FAILED" | "CREATE_UNKNOWN";
-    sessionId?: string | undefined;
-}>;
-type BindingRecord = z.infer<typeof recordSchema>;
-type BindingValue = Pick<BindingRecord, 'state' | 'sessionId'>;
 export declare class SessionBinding {
     readonly host: HostContext;
-    private readonly store;
+    private readonly creationStore;
+    private readonly bindings;
     private readonly key;
     constructor(host: HostContext, endpoint: string, userCode: string, root?: string);
-    static connect(service: CreationRuntime, host: HostContext): Promise<SessionBinding>;
-    private storage;
-    read(): Promise<BindingRecord | undefined>;
+    static connect(service: Pick<CreationRuntime, 'client'>, host: HostContext): Promise<SessionBinding>;
+    private creation;
     current(): Promise<{
-        version: 1;
+        state: "CREATING" | "CREATE_UNKNOWN" | "CREATE_FAILED" | "RESOLVED";
         revision: string;
-        updatedAt: string;
-        state: "UNBOUND" | "BOUND" | "CREATING" | "CREATE_FAILED" | "CREATE_UNKNOWN";
-        sessionId?: string | undefined;
+        requestedAt: string;
         host: HostContext;
     } | {
-        state: "UNBOUND";
-        host: HostContext;
-    }>;
-    private save;
-    select(service: CreationRuntime, sessionId: string): Promise<{
-        version: 1;
-        revision: string;
-        updatedAt: string;
-        state: "UNBOUND" | "BOUND" | "CREATING" | "CREATE_FAILED" | "CREATE_UNKNOWN";
-        sessionId?: string | undefined;
-    }>;
-    clear(): Promise<{
-        version: 1;
-        revision: string;
-        updatedAt: string;
-        state: "UNBOUND" | "BOUND" | "CREATING" | "CREATE_FAILED" | "CREATE_UNKNOWN";
         sessionId?: string | undefined;
+        host: HostContext;
+        state: "BOUND" | "UNBOUND";
     }>;
-    beginCreation(): Promise<string>;
-    finishCreation(revision: string, value: BindingValue): Promise<void>;
+    select(service: CreationRuntime, sessionId: string): Promise<void>;
+    clear(): Promise<void>;
+    remember(sessionId: string, requestedAt: string): Promise<void>;
+    beginCreation(requestedAt?: string): Promise<string>;
+    matchesCreation(revision: string): Promise<boolean>;
+    finishCreation(revision: string, state: 'CREATE_FAILED' | 'CREATE_UNKNOWN' | 'RESOLVED'): Promise<boolean>;
 }
-export {};