tinker-agent 2.9.0 → 2.10.0

package/src/remote/protocol.ts

@@ -0,0 +1,228 @@
+import type {
+  RemoteHistoryPage,
+  RemoteMessage,
+} from "../session/remote-history-reader";
+
+export const REMOTE_PROTOCOL_VERSION = 1;
+export type OperationStatus =
+  | "accepted"
+  | "running"
+  | "waiting_input"
+  | "completed"
+  | "failed"
+  | "cancelled"
+  | "interrupted";
+
+export type RemoteOperationInput = { requestId: string } & (
+  | { kind: "create"; workspaceId: string; title?: string }
+  | { kind: "adopt"; workspaceId: string; sessionId: string }
+  | { kind: "prompt"; sessionId: string; prompt: string }
+  | { kind: "stop"; sessionId: string; targetRequestId: string }
+  | {
+      kind: "answer";
+      sessionId: string;
+      interactionId: string;
+      selectedIndex: number | null;
+    }
+  | {
+      kind: "confirm";
+      sessionId: string;
+      interactionId: string;
+      decision: "allow" | "deny";
+    }
+);
+
+export type OperationReceipt = {
+  requestId: string;
+  sessionId: string;
+  kind: RemoteOperationInput["kind"];
+  status: OperationStatus;
+  createdAt: string;
+  updatedAt: string;
+  turnId?: string;
+  prompt?: string;
+  error?: string;
+};
+
+export type RemoteSessionInfo = {
+  id: string;
+  workspaceId: string;
+  title: string;
+  modelName: string;
+  owner: "service" | "local";
+  status: string;
+  updatedAt: string;
+};
+
+export type RemoteInteraction =
+  | {
+      id: string;
+      kind: "question";
+      question: string;
+      options: readonly { description: string }[];
+    }
+  | { id: string; kind: "confirmation"; command: string; reason: string };
+
+export type RemoteTool = {
+  id: string;
+  name: string;
+  arguments: string;
+  status: "running" | "completed" | "failed" | "cancelled";
+  detail?: string;
+};
+
+export type RemoteActivity = {
+  session: RemoteSessionInfo;
+  status: "idle" | OperationStatus;
+  activeRequestId?: string;
+  activeTurnId?: string;
+  streaming?: { iterationId: string; attempt: number; text: string };
+  tools: RemoteTool[];
+  interaction?: RemoteInteraction;
+  operations: OperationReceipt[];
+  error?: string;
+};
+
+export type RemoteView = RemoteActivity & { history: RemoteHistoryPage };
+export type RemoteChange = { activity: RemoteActivity; messages: RemoteMessage[] };
+export type RemoteCursor = { epoch: string; sequence: number };
+export type RemoteFrame = { version: 1; epoch: string; sequence: number } & (
+  | { type: "snapshot"; view: RemoteView }
+  | { type: "event"; change: RemoteChange }
+);
+
+export class RemoteError extends Error {
+  constructor(
+    readonly status: number,
+    readonly code: string,
+    message: string,
+  ) {
+    super(message);
+    this.name = "RemoteError";
+  }
+}
+
+export function isTerminal(status: OperationStatus): boolean {
+  return ["completed", "failed", "cancelled", "interrupted"].includes(status);
+}
+
+const ID = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,100}$/;
+const UUID =
+  /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+export function requireId(value: unknown, name: string, uuid = false): string {
+  if (typeof value !== "string" || !(uuid ? UUID : ID).test(value)) {
+    throw new RemoteError(400, "INVALID_REQUEST", `${name} is invalid.`);
+  }
+  return value;
+}
+
+export function parseOperation(value: unknown): RemoteOperationInput {
+  const object = requireObject(value);
+  const requestId = requireId(object.requestId, "requestId", true);
+  const kind = object.kind;
+  const sessionId = () => requireId(object.sessionId, "sessionId", true);
+  let result: RemoteOperationInput;
+  switch (kind) {
+    case "create":
+      result = {
+        requestId,
+        kind,
+        workspaceId: requireId(object.workspaceId, "workspaceId"),
+        ...(object.title === undefined
+          ? {}
+          : { title: requireText(object.title, "title", 240) }),
+      };
+      break;
+    case "adopt":
+      result = {
+        requestId,
+        kind,
+        workspaceId: requireId(object.workspaceId, "workspaceId"),
+        sessionId: sessionId(),
+      };
+      break;
+    case "prompt":
+      result = {
+        requestId,
+        kind,
+        sessionId: sessionId(),
+        prompt: requireText(object.prompt, "prompt", 64 * 1024),
+      };
+      break;
+    case "stop":
+      result = {
+        requestId,
+        kind,
+        sessionId: sessionId(),
+        targetRequestId: requireId(object.targetRequestId, "targetRequestId", true),
+      };
+      break;
+    case "confirm":
+      if (object.decision !== "allow" && object.decision !== "deny") {
+        throw new RemoteError(
+          400,
+          "INVALID_REQUEST",
+          "decision must be allow or deny.",
+        );
+      }
+      result = {
+        requestId,
+        kind,
+        sessionId: sessionId(),
+        interactionId: requireId(object.interactionId, "interactionId", true),
+        decision: object.decision,
+      };
+      break;
+    case "answer": {
+      const selectedIndex = object.selectedIndex;
+      if (
+        selectedIndex !== null &&
+        (typeof selectedIndex !== "number" ||
+          !Number.isSafeInteger(selectedIndex) ||
+          selectedIndex < 0)
+      ) {
+        throw new RemoteError(
+          400,
+          "INVALID_REQUEST",
+          "selectedIndex must be a nonnegative integer or null.",
+        );
+      }
+      result = {
+        requestId,
+        kind,
+        sessionId: sessionId(),
+        interactionId: requireId(object.interactionId, "interactionId", true),
+        selectedIndex,
+      };
+      break;
+    }
+    default:
+      throw new RemoteError(400, "INVALID_REQUEST", "Unknown operation kind.");
+  }
+  if (Object.keys(object).some((key) => !(key in result))) {
+    throw new RemoteError(400, "INVALID_REQUEST", "Unexpected operation field.");
+  }
+  return result;
+}
+
+export function requireObject(value: unknown): Record<string, unknown> {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+    throw new RemoteError(400, "INVALID_REQUEST", "Expected an object.");
+  }
+  return value as Record<string, unknown>;
+}
+
+export function requireText(value: unknown, name: string, maxBytes: number): string {
+  if (
+    typeof value !== "string" ||
+    !value.trim() ||
+    Buffer.byteLength(value) > maxBytes
+  ) {
+    throw new RemoteError(
+      400,
+      "INVALID_REQUEST",
+      `${name} must contain 1–${maxBytes} bytes.`,
+    );
+  }
+  return value;
+}

package/src/remote/service-store.ts

@@ -0,0 +1,175 @@
+import { Database } from "bun:sqlite";
+import { chmod, mkdir } from "node:fs/promises";
+import path from "node:path";
+import { stableJsonStringify, sha256 } from "../model/model-request-preflight";
+import { parseSessionId } from "../ids/runtime-id";
+import { SessionLease } from "../session/session-lock";
+import {
+  RemoteError,
+  type RemoteOperationInput,
+  type OperationReceipt,
+  type RemoteSessionInfo,
+} from "./protocol";
+
+export type ManagedSessionRecord = RemoteSessionInfo & {
+  workspacePath: string;
+  initialized: boolean;
+};
+type ReceiptRow = {
+  device: string;
+  fingerprint: string;
+  receipt: string;
+  input: string;
+};
+const SERVICE_LEASE_ID = parseSessionId("00000000-0000-7000-8000-000000000001");
+
+/** Durable acceptance receipts, separate from the canonical conversation databases. */
+export class RemoteServiceStore {
+  private constructor(
+    private readonly db: Database,
+    private readonly lease: SessionLease,
+  ) {}
+
+  static async open(directory: string): Promise<RemoteServiceStore> {
+    await mkdir(directory, { recursive: true, mode: 0o700 });
+    await chmod(directory, 0o700);
+    const lease = await SessionLease.acquire({
+      sessionDirectory: directory,
+      sessionId: SERVICE_LEASE_ID,
+    });
+    let db: Database | undefined;
+    try {
+      const filename = path.join(directory, "remote.sqlite");
+      db = new Database(filename, { create: true, strict: true });
+      await chmod(filename, 0o600);
+      db.exec(
+        "PRAGMA journal_mode=WAL; PRAGMA synchronous=FULL; PRAGMA busy_timeout=5000;",
+      );
+      const version = (
+        db.query("PRAGMA user_version").get() as { user_version: number }
+      ).user_version;
+      if (version !== 0 && version !== 1)
+        throw new Error("Unsupported remote state schema.");
+      db.exec(`CREATE TABLE IF NOT EXISTS managed_sessions (id TEXT PRIMARY KEY, record TEXT NOT NULL) STRICT;
+        CREATE TABLE IF NOT EXISTS operations (id TEXT PRIMARY KEY, session_id TEXT NOT NULL, device TEXT NOT NULL, fingerprint TEXT NOT NULL, input TEXT NOT NULL, receipt TEXT NOT NULL) STRICT;
+        CREATE INDEX IF NOT EXISTS operations_session ON operations(session_id);
+        PRAGMA user_version=1;`);
+      const store = new RemoteServiceStore(db, lease);
+      for (const row of db.query("SELECT receipt FROM operations").all() as {
+        receipt: string;
+      }[]) {
+        const receipt = JSON.parse(row.receipt) as OperationReceipt;
+        if (["accepted", "running", "waiting_input"].includes(receipt.status)) {
+          store.update({
+            ...receipt,
+            status: "interrupted",
+            error:
+              "The local service process stopped. This request will not be replayed automatically.",
+          });
+        }
+      }
+      return store;
+    } catch (error) {
+      db?.close();
+      await lease.release();
+      throw error;
+    }
+  }
+
+  sessions(): ManagedSessionRecord[] {
+    return (
+      this.db.query("SELECT record FROM managed_sessions").all() as { record: string }[]
+    ).map((row) => JSON.parse(row.record) as ManagedSessionRecord);
+  }
+  session(id: string): ManagedSessionRecord | undefined {
+    const row = this.db
+      .query("SELECT record FROM managed_sessions WHERE id = ?")
+      .get(id) as { record: string } | null;
+    return row ? (JSON.parse(row.record) as ManagedSessionRecord) : undefined;
+  }
+  saveSession(record: ManagedSessionRecord): void {
+    this.db
+      .query(
+        "INSERT INTO managed_sessions VALUES (?, ?) ON CONFLICT(id) DO UPDATE SET record=excluded.record",
+      )
+      .run(record.id, JSON.stringify(record));
+  }
+  existing(input: RemoteOperationInput, device: string): OperationReceipt | undefined {
+    const row = this.db
+      .query("SELECT * FROM operations WHERE id = ?")
+      .get(input.requestId) as ReceiptRow | null;
+    if (!row) return undefined;
+    if (row.device !== device || row.fingerprint !== sha256(stableJsonStringify(input)))
+      throw new RemoteError(
+        409,
+        "REQUEST_ID_REUSED",
+        "This request ID was already used with different data or by another device.",
+      );
+    return JSON.parse(row.receipt) as OperationReceipt;
+  }
+  accept(
+    input: RemoteOperationInput,
+    device: string,
+    sessionId: string,
+    session?: ManagedSessionRecord,
+  ): OperationReceipt {
+    const now = new Date().toISOString();
+    const receipt: OperationReceipt = {
+      requestId: input.requestId,
+      kind: input.kind,
+      sessionId,
+      status: "accepted",
+      createdAt: now,
+      updatedAt: now,
+      ...(input.kind === "prompt" ? { prompt: input.prompt } : {}),
+    };
+    this.db.transaction(() => {
+      this.db
+        .query("INSERT INTO operations VALUES (?, ?, ?, ?, ?, ?)")
+        .run(
+          input.requestId,
+          sessionId,
+          device,
+          sha256(stableJsonStringify(input)),
+          JSON.stringify(input),
+          JSON.stringify(receipt),
+        );
+      if (session) this.saveSession(session);
+    })();
+    return receipt;
+  }
+  get(id: string): OperationReceipt {
+    const row = this.db
+      .query("SELECT receipt FROM operations WHERE id = ?")
+      .get(id) as { receipt: string } | null;
+    if (!row)
+      throw new RemoteError(
+        404,
+        "REQUEST_NOT_FOUND",
+        "Request was not accepted by this service.",
+      );
+    return JSON.parse(row.receipt) as OperationReceipt;
+  }
+  operations(sessionId: string): OperationReceipt[] {
+    return (
+      this.db
+        .query(
+          "SELECT receipt FROM operations WHERE session_id = ? ORDER BY rowid DESC LIMIT 100",
+        )
+        .all(sessionId) as { receipt: string }[]
+    )
+      .reverse()
+      .map((row) => JSON.parse(row.receipt) as OperationReceipt);
+  }
+  update(receipt: OperationReceipt): OperationReceipt {
+    const next = { ...receipt, updatedAt: new Date().toISOString() };
+    this.db
+      .query("UPDATE operations SET receipt = ? WHERE id = ?")
+      .run(JSON.stringify(next), receipt.requestId);
+    return next;
+  }
+  async close(): Promise<void> {
+    this.db.close();
+    await this.lease.release();
+  }
+}

package/src/remote/service.ts

@@ -0,0 +1,219 @@
+import { randomUUID } from "node:crypto";
+import { createUuidV7 } from "../ids/uuid-v7";
+import { parseSessionId } from "../ids/runtime-id";
+import { SessionCatalog } from "../session/session-catalog";
+import {
+  HostedSession,
+  type HostedRuntimeFactory,
+} from "../agent/runtime-hosted-session";
+import type { RemoteWorkspaceConfig } from "./config";
+import { RemoteServiceStore, type ManagedSessionRecord } from "./service-store";
+import {
+  RemoteError,
+  type RemoteOperationInput,
+  type OperationReceipt,
+  type RemoteSessionInfo,
+} from "./protocol";
+
+export class RemoteService {
+  readonly epoch = randomUUID();
+  private readonly hosted = new Map<string, HostedSession>();
+  private submitting: Promise<void> = Promise.resolve();
+  private stopping = false;
+  constructor(
+    readonly store: RemoteServiceStore,
+    readonly workspaces: readonly RemoteWorkspaceConfig[],
+    private readonly factory: HostedRuntimeFactory,
+    private readonly homeRoot?: string,
+  ) {}
+
+  async initialize(): Promise<void> {
+    // Reacquire every managed canonical lease; no prompt is resubmitted on boot.
+    for (const record of this.store.sessions()) {
+      if (!record.initialized) continue;
+      try {
+        await this.session(record.id).open();
+      } catch {
+        /* A failed workspace/session remains visible with its error. */
+      }
+    }
+  }
+  workspace(id: string): RemoteWorkspaceConfig {
+    const workspace = this.workspaces.find((workspace) => workspace.id === id);
+    if (!workspace)
+      throw new RemoteError(
+        404,
+        "WORKSPACE_NOT_FOUND",
+        "This workspace is not configured on the Mac.",
+      );
+    return workspace;
+  }
+  session(id: string): HostedSession {
+    const existing = this.hosted.get(id);
+    if (existing) return existing;
+    const record = this.store.session(id);
+    if (!record)
+      throw new RemoteError(
+        404,
+        "SESSION_NOT_MANAGED",
+        "Attach this local session before connecting to it.",
+      );
+    const workspace = this.workspace(record.workspaceId);
+    if (record.workspacePath !== workspace.path)
+      throw new RemoteError(
+        409,
+        "WORKSPACE_CHANGED",
+        "The managed session belongs to a different workspace path.",
+      );
+    const hosted = new HostedSession(record, this.store, this.epoch, this.factory);
+    this.hosted.set(id, hosted);
+    return hosted;
+  }
+  async listSessions(workspaceId: string): Promise<RemoteSessionInfo[]> {
+    const workspace = this.workspace(workspaceId);
+    const local = await new SessionCatalog({
+      workspaceRoot: workspace.path,
+      homeRoot: this.homeRoot,
+    }).listAll();
+    const managed = this.store
+      .sessions()
+      .filter((record) => record.workspaceId === workspaceId);
+    return [
+      ...managed.map((record) => {
+        const view = this.hosted.get(record.id)?.view();
+        return (
+          view?.session ?? {
+            id: record.id,
+            workspaceId,
+            title: record.title,
+            modelName: record.modelName,
+            owner: "service" as const,
+            status: record.initialized ? "idle" : "interrupted",
+            updatedAt: record.updatedAt,
+          }
+        );
+      }),
+      ...local
+        .filter((summary) => !managed.some((record) => record.id === summary.sessionId))
+        .map((summary) => ({
+          id: summary.sessionId,
+          workspaceId,
+          title: summary.firstUserPromptPreview ?? "Empty session",
+          modelName: summary.modelName,
+          owner: "local" as const,
+          status: summary.status,
+          updatedAt: summary.updatedAt,
+        })),
+    ].sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+  }
+
+  submit(input: RemoteOperationInput, device: string): Promise<OperationReceipt> {
+    // Serializes acceptance and any async catalog lookup, never task execution.
+    const result = this.submitting.then(() => this.accept(input, device));
+    this.submitting = result.then(
+      () => undefined,
+      () => undefined,
+    );
+    return result;
+  }
+  private async accept(
+    input: RemoteOperationInput,
+    device: string,
+  ): Promise<OperationReceipt> {
+    const existing = this.store.existing(input, device);
+    if (existing) return existing;
+    if (this.stopping)
+      throw new RemoteError(503, "SERVICE_STOPPING", "The local service is stopping.");
+    if (input.kind === "create" || input.kind === "adopt") {
+      const workspace = this.workspace(input.workspaceId);
+      const id = input.kind === "create" ? createUuidV7() : input.sessionId;
+      if (this.store.sessions().length >= 128)
+        throw new RemoteError(
+          409,
+          "SESSION_LIMIT",
+          "The service has reached its 128 managed session limit.",
+        );
+      let record: ManagedSessionRecord;
+      if (input.kind === "adopt") {
+        if (this.store.session(id))
+          throw new RemoteError(
+            409,
+            "ALREADY_MANAGED",
+            "This session is already owned by the service.",
+          );
+        const summary = await new SessionCatalog({
+          workspaceRoot: workspace.path,
+          homeRoot: this.homeRoot,
+        }).get(parseSessionId(id));
+        if (summary.status !== "resumable" && summary.status !== "interrupted")
+          throw new RemoteError(
+            409,
+            "SESSION_UNAVAILABLE",
+            "Exit its local TUI before attaching this session; it must be resumable.",
+          );
+        record = {
+          id,
+          workspaceId: workspace.id,
+          workspacePath: workspace.path,
+          title: summary.firstUserPromptPreview ?? "Empty session",
+          modelName: summary.modelName,
+          owner: "service",
+          status: "accepted",
+          updatedAt: new Date().toISOString(),
+          initialized: true,
+        };
+      } else {
+        record = {
+          id,
+          workspaceId: workspace.id,
+          workspacePath: workspace.path,
+          title: input.title ?? "New session",
+          modelName: "",
+          owner: "service",
+          status: "accepted",
+          updatedAt: new Date().toISOString(),
+          initialized: false,
+        };
+      }
+      const receipt = this.store.accept(input, device, id, record);
+      const hosted = this.session(id);
+      void hosted.open().then(
+        () => {
+          this.store.update({ ...receipt, status: "completed" });
+          hosted.receiptChanged();
+        },
+        (error: unknown) => {
+          this.store.update({
+            ...receipt,
+            status: "failed",
+            error: error instanceof Error ? error.message : String(error),
+          });
+        },
+      );
+      return receipt;
+    }
+    const session = this.session(input.sessionId);
+    // Attach/initialization must be complete before a new mutation can be accepted.
+    await session.open();
+    session.validate(input);
+    const receipt = this.store.accept(input, device, input.sessionId);
+    if (input.kind === "prompt") session.enqueue(receipt);
+    else session.control(input, receipt);
+    return receipt;
+  }
+
+  async close(): Promise<void> {
+    this.stopping = true;
+    await this.submitting;
+    const results = await Promise.allSettled(
+      [...this.hosted.values()].map((session) => session.close()),
+    );
+    await this.store.close();
+    const errors = results.filter((result) => result.status === "rejected");
+    if (errors.length)
+      throw new AggregateError(
+        errors.map((result) => result.reason as unknown),
+        "Remote service shutdown failed.",
+      );
+  }
+}