@tessar/core 0.1.0-alpha.0 → 0.1.0

package/dist/state/threads.js

@@ -1,6 +1,6 @@
 import { fail } from "../errors.js";
-import { randomIds, systemClock } from "../json.js";
-import { normalizeInstruction } from "../instructions/instruction.js";
+import { randomIds, systemClock, } from "../json.js";
+import { normalizeInstruction, } from "../instructions/instruction.js";
 import { CommitCoordinator } from "./commit.js";
 import { matchesScope, normalizeScope } from "./scope.js";
 export class ThreadService {
@@ -13,10 +13,45 @@ export class ThreadService {
         this.clock = clock;
     }
     async create(options = {}, internal) {
-        const id = this.ids.next("thread"), lease = await this.backend.ownership.acquire({ threadId: id, ownerToken: this.ids.next("owner"), ttlMs: 30000 });
+        const id = this.ids.next("thread"), lease = await this.backend.ownership.acquire({
+            threadId: id,
+            ownerToken: this.ids.next("owner"),
+            ttlMs: 30000,
+        });
         try {
-            const cp = { id: this.ids.next("checkpoint"), threadId: id, parentCheckpointId: null, revision: 1, schemaVersion: 1, createdAt: this.clock.now(), cause: internal?.lineage ? "ForkCreated" : "ThreadCreated", execution: null, state: { scope: normalizeScope(options.scope), metadata: { ...options.metadata, ...(options.title !== undefined ? { title: options.title } : {}) }, instructions: options.instructions !== undefined ? normalizeInstruction(options.instructions) : null, messages: options.messages ?? [], pluginStates: (internal?.pluginStates ?? []).map(state => ({ ...state, ownerId: id })) } };
-            await new CommitCoordinator(this.backend).commit({ commitId: this.ids.next("commit"), threadId: id, expectedRevision: 0, checkpoint: cp, records: [], ...(internal?.lineage ? { lineage: internal.lineage } : {}) }, lease);
+            const cp = {
+                id: this.ids.next("checkpoint"),
+                threadId: id,
+                parentCheckpointId: null,
+                revision: 1,
+                schemaVersion: 1,
+                createdAt: this.clock.now(),
+                cause: internal?.lineage ? "ForkCreated" : "ThreadCreated",
+                execution: null,
+                state: {
+                    scope: normalizeScope(options.scope),
+                    metadata: {
+                        ...options.metadata,
+                        ...(options.title !== undefined ? { title: options.title } : {}),
+                    },
+                    instructions: options.instructions !== undefined
+                        ? normalizeInstruction(options.instructions)
+                        : null,
+                    messages: options.messages ?? [],
+                    pluginStates: (internal?.pluginStates ?? []).map((state) => ({
+                        ...state,
+                        ownerId: id,
+                    })),
+                },
+            };
+            await new CommitCoordinator(this.backend).commit({
+                commitId: this.ids.next("commit"),
+                threadId: id,
+                expectedRevision: 0,
+                checkpoint: cp,
+                records: [],
+                ...(internal?.lineage ? { lineage: internal.lineage } : {}),
+            }, lease);
             return (await this.backend.threads.get(id));
         }
         finally {
@@ -29,21 +64,51 @@ export class ThreadService {
             fail("ThreadNotFound", "Thread does not match query");
         if (head.activeStreamId)
             fail("ThreadBusy", "Thread has unfinished execution");
-        const lease = await this.backend.ownership.acquire({ threadId: id, ownerToken: this.ids.next("owner"), ttlMs: 30000 });
+        const lease = await this.backend.ownership.acquire({
+            threadId: id,
+            ownerToken: this.ids.next("owner"),
+            ttlMs: 30000,
+        });
         try {
             const cp = (await this.backend.checkpoints.get(head.currentCheckpointId));
             const transformed = transform(cp);
-            if (JSON.stringify(transformed.state.scope) !== JSON.stringify(cp.state.scope))
+            if (JSON.stringify(transformed.state.scope) !==
+                JSON.stringify(cp.state.scope))
                 fail("ThreadScopeMismatch", "Scope cannot be changed");
-            const next = { ...transformed, id: this.ids.next("checkpoint"), threadId: id, parentCheckpointId: cp.id, revision: cp.revision + 1, createdAt: this.clock.now() };
-            await new CommitCoordinator(this.backend).commit({ commitId: this.ids.next("commit"), threadId: id, expectedRevision: cp.revision, checkpoint: next, records: [], ...(deleteThread ? { deleteThread: true } : {}) }, lease);
+            const next = {
+                ...transformed,
+                id: this.ids.next("checkpoint"),
+                threadId: id,
+                parentCheckpointId: cp.id,
+                revision: cp.revision + 1,
+                createdAt: this.clock.now(),
+            };
+            await new CommitCoordinator(this.backend).commit({
+                commitId: this.ids.next("commit"),
+                threadId: id,
+                expectedRevision: cp.revision,
+                checkpoint: next,
+                records: [],
+                ...(deleteThread ? { deleteThread: true } : {}),
+            }, lease);
         }
         finally {
             await this.backend.ownership.release(lease);
         }
     }
-    async rename(id, title, query = {}) { if (typeof title !== "string")
-        fail("InvalidConfiguration", "Title must be text"); return this.mutate(id, cp => ({ ...cp, state: { ...cp.state, metadata: { ...cp.state.metadata, title } } }), query); }
-    async delete(id, query = {}) { return this.mutate(id, cp => cp, query, true); }
+    async rename(id, title, query = {}) {
+        if (typeof title !== "string")
+            fail("InvalidConfiguration", "Title must be text");
+        return this.mutate(id, (cp) => ({
+            ...cp,
+            state: { ...cp.state, metadata: { ...cp.state.metadata, title } },
+        }), query);
+    }
+    purge(id, query = {}) {
+        return this.backend.threads.purge(id, query);
+    }
+    async delete(id, query = {}) {
+        return this.mutate(id, (cp) => cp, query, true);
+    }
 }
 //# sourceMappingURL=threads.js.map

package/dist/state/threads.js.map

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

package/dist/testing/harness.d.ts

@@ -1,4 +1,4 @@
-import { Agent, type ExecutionRequest, type Stream, type DeliveryTarget } from "../agent.js";
+import { Agent, type ExecutionRequest, type Stream, type DeliveryTarget, type AgentTools } from "../agent.js";
 import { Controller } from "../controller.js";
 import type { Plugin } from "../plugins/context.js";
 import type { StorageBackend } from "../state/storage-ports.js";
@@ -19,6 +19,7 @@ export declare class AgentHarness {
         backend?: StorageBackend;
         instructions?: string;
         limits?: Partial<StreamLimits>;
+        tools?: AgentTools;
     }): Promise<AgentHarness>;
     admit(request: ExecutionRequest, target?: DeliveryTarget): Stream;
     createThread(options?: CreateThreadOptions): Promise<import("../state/schema.js").ThreadInfo>;

package/dist/testing/harness.js

@@ -1,9 +1,9 @@
+import { stream as streamHooks } from "../events/type.js";
 import { Agent, } from "../agent.js";
 import { Controller } from "../controller.js";
 import { createMemoryBackend } from "../state/memory-backend.js";
 import { ThreadService } from "../state/threads.js";
 import { ScriptedProvider } from "./scripted-provider.js";
-import { AgentEvents } from "../events/catalog.js";
 import { errorFromInfo } from "../errors.js";
 export class AgentHarness {
     agent;
@@ -26,8 +26,10 @@ export class AgentHarness {
         const backend = options.backend ?? createMemoryBackend(), provider = new ScriptedProvider(options.modelScripts ?? []);
         const agent = new Agent({
             id: "test-agent",
+            model: provider.ref,
             instructions: options.instructions,
             limits: options.limits,
+            tools: options.tools,
         });
         const controller = new Controller({
             id: "test-controller",
@@ -36,13 +38,13 @@ export class AgentHarness {
                 {
                     id: "test-storage",
                     setup(tessar) {
-                        tessar.storage.registerBackend(backend);
+                        tessar.storage.register(backend);
                     },
                 },
                 {
                     id: "scripted",
                     setup(tessar) {
-                        tessar.models.registerProvider({
+                        tessar.models.register({
                             id: "scripted",
                             create: () => provider,
                         });
@@ -64,7 +66,7 @@ export class AgentHarness {
         const events = [];
         for await (const event of stream) {
             events.push(event);
-            if (event.is(AgentEvents.StreamError))
+            if (event.is(streamHooks.error))
                 throw errorFromInfo(event.payload.error);
         }
         return events;

package/dist/testing/harness.js.map

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

package/dist/testing/scripted-provider.d.ts

@@ -13,6 +13,7 @@ export declare class ScriptedProvider implements ModelAdapter {
     readonly ref: ModelRef;
     readonly calls: ModelRequest[];
     constructor(scripts: readonly ModelScript[]);
+    withModel(modelId: string): ModelAdapter;
     validate(request: ModelRequest): void;
     stream(request: ModelRequest, context: ModelCallContext): AsyncIterable<ModelChunk>;
 }

package/dist/testing/scripted-provider.js

@@ -10,6 +10,13 @@ export class ScriptedProvider {
     constructor(scripts) {
         this.scripts = scripts;
     }
+    withModel(modelId) {
+        return {
+            ref: { ...this.ref, modelId },
+            validate: this.validate.bind(this),
+            stream: this.stream.bind(this),
+        };
+    }
     validate(request) {
         if (request.model.providerId !== this.ref.providerId)
             throw new TessarError("ModelContextIncompatible", "Wrong provider");

package/dist/testing/scripted-provider.js.map

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

package/dist/testing/storage-conformance.js

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { CommitCoordinator } from "../state/commit.js";
+import { ThreadService } from "../state/threads.js";
 export function initialBatch(threadId = "t1") {
     return {
         commitId: "commit-" + threadId,
@@ -27,6 +28,116 @@ export function initialBatch(threadId = "t1") {
 }
 export function storageConformance(name, factory) {
     describe(name, () => {
+        it("rejects checkpoint identity reuse and leaves the other thread unpublished", async () => {
+            const backend = await factory();
+            try {
+                const original = initialBatch();
+                const lease = await backend.ownership.acquire({
+                    threadId: original.threadId,
+                    ownerToken: "owner",
+                    ttlMs: 60000,
+                });
+                await new CommitCoordinator(backend).commit(original, lease);
+                const conflicting = initialBatch("other");
+                conflicting.checkpoint.id = original.checkpoint.id;
+                const other = await backend.ownership.acquire({
+                    threadId: conflicting.threadId,
+                    ownerToken: "other",
+                    ttlMs: 60000,
+                });
+                await expect(new CommitCoordinator(backend).commit(conflicting, other)).rejects.toMatchObject({ code: "CommitConflict" });
+                expect(await backend.threads.get(conflicting.threadId)).toBeNull();
+                expect(await backend.checkpoints.get(original.checkpoint.id)).toEqual(original.checkpoint);
+            }
+            finally {
+                await backend.close();
+            }
+        });
+        it("rejects an idempotent commit receipt requested with different membership", async () => {
+            const backend = await factory();
+            try {
+                const batch = initialBatch();
+                const lease = await backend.ownership.acquire({
+                    threadId: batch.threadId,
+                    ownerToken: "owner",
+                    ttlMs: 60000,
+                });
+                await new CommitCoordinator(backend).commit(batch, lease);
+                for (const patch of [{ threadId: "other" }, { expectedRevision: 9 }])
+                    await expect(backend.commits.publish({
+                        commitId: batch.commitId,
+                        threadId: batch.threadId,
+                        expectedRevision: 0,
+                        lease,
+                        ...patch,
+                    })).rejects.toMatchObject({ code: "CommitConflict" });
+            }
+            finally {
+                await backend.close();
+            }
+        });
+        it("preserves fencing counters through purge and cannot revive an old same-owner lease", async () => {
+            const backend = await factory();
+            try {
+                const batch = initialBatch(), ownerToken = "same-owner";
+                const old = await backend.ownership.acquire({
+                    threadId: batch.threadId,
+                    ownerToken,
+                    ttlMs: 60000,
+                });
+                await new CommitCoordinator(backend).commit(batch, old);
+                await backend.ownership.release(old);
+                await new ThreadService(backend).delete(batch.threadId);
+                const beforePurge = await backend.ownership.acquire({
+                    threadId: batch.threadId,
+                    ownerToken,
+                    ttlMs: 60000,
+                });
+                await backend.ownership.release(beforePurge);
+                await backend.threads.purge(batch.threadId);
+                const current = await backend.ownership.acquire({
+                    threadId: batch.threadId,
+                    ownerToken,
+                    ttlMs: 60000,
+                });
+                expect(current.fencingToken).toBeGreaterThan(beforePurge.fencingToken);
+                await expect(backend.ownership.renew(old, 60000)).rejects.toMatchObject({ code: "OwnershipLost" });
+                await backend.ownership.release(old);
+                await expect(backend.ownership.renew(current, 60000)).resolves.toMatchObject({ fencingToken: current.fencingToken });
+            }
+            finally {
+                await backend.close();
+            }
+        });
+        it("rejects publication using another thread's valid lease", async () => {
+            const backend = await factory();
+            try {
+                const a = await backend.ownership.acquire({
+                    threadId: "a",
+                    ownerToken: "a",
+                    ttlMs: 60000,
+                });
+                const b = await backend.ownership.acquire({
+                    threadId: "b",
+                    ownerToken: "b",
+                    ttlMs: 60000,
+                });
+                const batch = initialBatch("b");
+                await backend.commits.stage(batch);
+                await expect(backend.commits.publish({
+                    commitId: batch.commitId,
+                    threadId: "b",
+                    expectedRevision: 0,
+                    lease: a,
+                })).rejects.toMatchObject({ code: "OwnershipLost" });
+                expect(await backend.threads.get("b")).toBeNull();
+                await expect(new CommitCoordinator(backend).commit(batch, a)).rejects.toMatchObject({ code: "OwnershipLost" });
+                expect((await new CommitCoordinator(backend).commit(batch, b)).threadId).toBe("b");
+            }
+            finally {
+                await backend.close();
+            }
+        });
         it("keeps staging hidden and publishes one immutable revision idempotently", async () => {
             const backend = await factory();
             try {

package/dist/testing/storage-conformance.js.map

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

package/dist/thread.d.ts

@@ -7,9 +7,11 @@ import type { MessageData } from "./messages/message.js";
 import type { PageOptions, Scope, StreamLimits, ThreadInfo } from "./state/schema.js";
 import type { HistoryOptions } from "./state/queries.js";
 import type { DeliveryTarget, Stream } from "./engine/delivery.js";
+import type { SessionHookHandle } from "./plugins/context.js";
 export type ThreadStreamOptions = {
     signal?: AbortSignal;
     context?: JsonObject;
+    modelOptions?: JsonObject;
     limits?: Partial<StreamLimits>;
 } & ({
     input: MessageData | readonly MessageData[];
@@ -58,7 +60,7 @@ export declare class Thread {
     }>;
     getHistory(options?: HistoryOptions): Promise<import("./state/queries.js").HistoryPage>;
     getCheckpoint(id: string): Promise<import("./state/schema.js").Checkpoint | null>;
-    listCheckpoints(options?: PageOptions): Promise<import("./state/schema.js").Page<import("./state/queries.js").CheckpointInfo>>;
+    listCheckpoints(options?: PageOptions): Promise<import("./state/schema.js").Page<import("./state/schema.js").CheckpointInfo>>;
     getStream(id: string): Promise<import("./index.js").StreamRecord | null>;
     listStreams(options?: PageOptions): Promise<import("./state/schema.js").Page<import("./index.js").StreamRecord>>;
     listTurns(streamId: string, options?: PageOptions): Promise<import("./state/schema.js").Page<import("./index.js").TurnRecord>>;
@@ -69,7 +71,7 @@ export declare class Thread {
         status?: "pending" | "resolved" | "cancelled";
     }): Promise<import("./state/schema.js").Page<import("./state/schema.js").InterruptRecord>>;
     stream(options: ThreadStreamOptions): Stream;
-    /** @internal */ admit(options: ThreadStreamOptions, target: DeliveryTarget): Stream;
+    /** @internal */ admit(options: ThreadStreamOptions, target: DeliveryTarget, session?: SessionHookHandle): Stream;
     cancelStream(streamId: string, reason?: string): Promise<void>;
     dispose(): Promise<void>;
 }

package/dist/thread.js

@@ -1,7 +1,7 @@
+import { thread as threadHooks } from "./events/type.js";
 import { fail } from "./errors.js";
 import { immutable } from "./json.js";
 import { inputMessages } from "./agent.js";
-import { AgentEvents } from "./events/catalog.js";
 import { aggregateUsage } from "./trace/usage.js";
 export class Thread {
     controller;
@@ -67,12 +67,17 @@ export class Thread {
     stream(options) {
         return this.admit(options, { kind: "iterator" });
     }
-    /** @internal */ admit(options, target) {
+    /** @internal */ admit(options, target, session) {
         this.check();
         const controller = this.controller, model = options.model
             ? controller.resolveModel(options.model).ref
             : undefined;
-        const common = { threadId: this.id, signal: options.signal };
+        const common = {
+            threadId: this.id,
+            signal: options.signal,
+            thread: this,
+            session,
+        };
         const prepare = async () => {
             await controller.queries.requireThread(this.id, this.filter);
         };
@@ -85,6 +90,7 @@ export class Thread {
                 input: inputMessages(options.input),
                 model: controller.resolveModel(options.model).ref,
                 context: options.context,
+                modelOptions: options.modelOptions,
                 limits: options.limits,
                 origin: options.origin,
             }, target, prepare);
@@ -101,7 +107,9 @@ export class Thread {
     async cancelStream(streamId, reason) {
         this.check();
         await this.query.requireThread(this.id, this.filter);
-        await this.controller.agent.cancel(this.id, streamId, reason);
+        await this.controller.agent.cancel(this.id, streamId, reason, undefined, {
+            thread: this,
+        });
     }
     async dispose() {
         if (this.disposed)
@@ -113,9 +121,9 @@ export class Thread {
             threadId: this.id,
             scope: this.scope,
         };
-        await this.controller.hooks.dispatch(AgentEvents.ThreadBeforeShutdown, { threadId: this.id }, context);
+        await this.controller.hooks.dispatch(threadHooks.beforeShutdown, { threadId: this.id }, context);
         this.disposed = true;
-        await this.controller.hooks.dispatch(AgentEvents.ThreadShutdown, { threadId: this.id }, context);
+        await this.controller.hooks.dispatch(threadHooks.shutdown, { threadId: this.id }, context);
     }
 }
 //# sourceMappingURL=thread.js.map

package/dist/thread.js.map

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

package/dist/tools/tool.d.ts

@@ -1,11 +1,8 @@
+import { z } from "zod";
 import { type JsonObject, type JsonValue } from "../json.js";
-import type { ContentPart } from "../messages/parts.js";
-import type { InputDefinition } from "./input-definition.js";
+import { ToolMessage } from "../messages/message.js";
 import type { TrackedServices } from "../engine/tracked-effects.js";
-export interface ToolResult {
-    readonly content: readonly ContentPart[];
-    readonly metadata?: JsonObject;
-}
+export type ToolOutput = JsonValue | ToolMessage;
 export interface ToolExecutionContext extends TrackedServices {
     readonly signal: AbortSignal;
     readonly threadId: string;
@@ -16,7 +13,7 @@ export interface ToolExecutionContext extends TrackedServices {
 }
 export type ReconcileResult = {
     status: "completed";
-    result: ToolResult;
+    result: ToolOutput;
 } | {
     status: "safeToRetry";
 } | {
@@ -35,17 +32,19 @@ export interface ToolRecovery<I> {
 export interface ToolDefinition<I> {
     name: string;
     description: string;
-    input: InputDefinition<I>;
-    execute(input: I, context: ToolExecutionContext): Promise<ToolResult>;
+    schema: z.ZodType<I>;
+    execute(input: I, context: ToolExecutionContext): ToolOutput | Promise<ToolOutput>;
     recovery?: ToolRecovery<I>;
 }
 export declare class Tool<I = any> {
     readonly name: string;
     readonly description: string;
-    readonly input: InputDefinition<I>;
-    readonly execute: ToolDefinition<I>["execute"];
+    readonly schema: z.ZodType<I>;
+    readonly jsonSchema: JsonObject;
+    readonly execute: (input: I, context: ToolExecutionContext) => Promise<ToolMessage>;
     readonly recovery?: ToolRecovery<I>;
     constructor(definition: ToolDefinition<I>);
 }
 export declare function createTool<I>(definition: ToolDefinition<I>): Tool<I>;
-export declare function toolResult(content: string | readonly ContentPart[], metadata?: JsonObject): ToolResult;
+/** @internal Normalize developer results and bind runtime correlation. */
+export declare function normalizeToolOutput(value: ToolOutput, toolCallId?: string): ToolMessage;