@morty-build/cli 0.2.0 → 0.4.0

package/dist/{chunk-MBS25BBY.js → chunk-OCDHOJ7L.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-ZSUNNLEK.js";
+} from "./chunk-XU65UWFZ.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -20087,16 +20087,16 @@ var sessionStatusSchema = external_exports.discriminatedUnion("kind", [
     /**
      * Present when the Session's most recent started command failed, while the Runtime retains its receipt, so
      * a client that did not watch it can still show the Session failed until another command starts. It
-     * carries what the execution's `lastTurn` reports for that failure. Runtimes before it existed omit it.
+     * carries what the execution's `lastTurn` reports for that failure.
      */
-    failedTurn: external_exports.object({ code: identifierStringSchema, commandId: identifierStringSchema, message: external_exports.string().min(1).max(500) }).readonly().optional().catch(void 0)
+    failedTurn: external_exports.object({ code: identifierStringSchema, commandId: identifierStringSchema, message: external_exports.string().min(1).max(500) }).readonly().optional()
   }).readonly(),
   external_exports.object({
     commandId: identifierStringSchema,
     kind: external_exports.literal("working")
   }).readonly()
 ]);
-var sessionCapabilitiesSchema = external_exports.object({
+var sessionCapabilitiesSchema = external_exports.strictObject({
   additionalDirectories: external_exports.boolean(),
   audioPrompt: external_exports.boolean(),
   closeSession: external_exports.boolean(),
@@ -20105,11 +20105,11 @@ var sessionCapabilitiesSchema = external_exports.object({
   imagePrompt: external_exports.boolean(),
   listSessions: external_exports.boolean(),
   loadSession: external_exports.boolean(),
-  promptQueueing: external_exports.boolean().default(false),
-  renameSession: external_exports.boolean().default(false),
+  promptQueueing: external_exports.boolean(),
+  renameSession: external_exports.boolean(),
   resumeSession: external_exports.boolean(),
-  steering: external_exports.boolean().default(false),
-  unstableForkSession: external_exports.boolean().default(false)
+  steering: external_exports.boolean(),
+  unstableForkSession: external_exports.boolean()
 }).readonly();
 var sessionCommandSchema = external_exports.object({
   description: SHORT_TEXT,
@@ -20162,13 +20162,12 @@ var agentModelEffortSchema = external_exports.object({
   effortSettingId: external_exports.string().max(128),
   modelSettingId: external_exports.string().max(128),
   resolution: agentModelEffortResolutionSchema,
-  unsupportedModelIds: external_exports.array(external_exports.string().min(1).max(500)).max(500).readonly().default([]),
+  unsupportedModelIds: external_exports.array(external_exports.string().min(1).max(500)).max(500).readonly(),
   valuesByModel: external_exports.record(external_exports.string().min(1).max(500), external_exports.array(configValueSchema).max(500).readonly()).readonly()
 }).readonly();
 var agentSettingsDiscoverCommandSchema = external_exports.object({
   agentId: identifierStringSchema,
-  // The directory a Session would start in, whose project settings the Agent reads. Omitted, the Runtime's
-  // default directory. A Runtime that predates this field ignores it; see the discovered event's `directoryId`.
+  // The directory whose project settings the Agent reads. Omitted means the default directory.
   directoryId: DIRECTORY_IDENTIFIER.optional(),
   kind: external_exports.literal(AGENT_SETTINGS_DISCOVER_KIND),
   model: external_exports.string().min(1).max(500).optional(),
@@ -20178,9 +20177,8 @@ var agentSettingsDiscoveredEventSchema = external_exports.object({
   agentId: identifierStringSchema,
   agentName: external_exports.string().max(255),
   agentVersion: external_exports.string().max(128),
-  // The directory the settings were discovered in. Absent from older Runtimes, which always discover in the
-  // Runtime's default directory whatever the command named.
-  directoryId: DIRECTORY_IDENTIFIER.optional(),
+  // The directory actually inspected.
+  directoryId: DIRECTORY_IDENTIFIER,
   kind: external_exports.literal(AGENT_SETTINGS_DISCOVERED_KIND),
   modelEffort: agentModelEffortSchema,
   requestId: identifierStringSchema,
@@ -20435,12 +20433,11 @@ var elicitationFieldSchema = external_exports.object({
 }).readonly();
 var sessionPermissionRequestedEventSchema = external_exports.object({
   commandId: identifierStringSchema,
-  // Absent only for events from older runtimes and saved history.
   details: external_exports.object({
     cwd: external_exports.string().min(1).max(4096),
     rawInput: boundedJsonSchema.optional(),
     locations: external_exports.array(toolCallLocationSchema).max(1e3).readonly()
-  }).readonly().optional(),
+  }).readonly(),
   interactionId: identifierStringSchema,
   kind: external_exports.literal(SESSION_PERMISSION_REQUESTED_KIND),
   options: external_exports.array(permissionOptionSchema).min(1).max(20).readonly(),
@@ -20898,9 +20895,8 @@ var promptMessageOutcomeSchema = external_exports.object({
 var sessionEventLogPageSchema = external_exports.object({
   events: external_exports.array(sessionEventSchema).max(MAX_EVENT_COUNT).readonly(),
   nextCursor: external_exports.string().min(1).max(512).nullable(),
-  // The settled prompts, among those the Runtime still retains, whose user message is on this page. Absent from
-  // older Runtimes and from pages that are not a Session's own history.
-  promptOutcomes: external_exports.array(promptMessageOutcomeSchema).max(MAX_EVENT_COUNT).readonly().optional(),
+  // Retained settled prompts whose user message is on this page; empty outside Session history.
+  promptOutcomes: external_exports.array(promptMessageOutcomeSchema).max(MAX_EVENT_COUNT).readonly(),
   sessionGenerationId: identifierStringSchema,
   tailCursor: external_exports.string().max(512),
   // The generation-scoped live position covered by this snapshot, including
@@ -21156,7 +21152,7 @@ var sessionMetadataSchema = external_exports.object({
   directoryLabel: external_exports.string().min(1).max(MAX_WORKSPACE_PATH_LENGTH),
   prompted: external_exports.boolean(),
   sessionId: identifierStringSchema,
-  status: sessionStatusSchema.default({ kind: "idle" }),
+  status: sessionStatusSchema,
   title: external_exports.string().max(500),
   updatedAt: external_exports.iso.datetime({ offset: true })
 }).readonly();
@@ -21345,7 +21341,7 @@ var promptAttachmentSchema = external_exports.object({
 var decodePromptAttachmentsValue = (value) => decodeZodValue(value, external_exports.array(promptAttachmentSchema).max(16).readonly());
 function readPromptDisposition(value) {
   const field = value["disposition"];
-  if (field === void 0 || field === SessionPromptDisposition.Reject) {
+  if (field === SessionPromptDisposition.Reject) {
     return SessionPromptDisposition.Reject;
   }
   if (field === SessionPromptDisposition.Queue) {
@@ -21370,8 +21366,7 @@ function decodeSessionPromptCommand(encoded) {
     throw new ProtocolMessageError("Prompt must contain content");
   }
   const disposition = readPromptDisposition(value);
-  const rawTargetCommandId = value["targetCommandId"];
-  const targetCommandId = rawTargetCommandId === void 0 ? "" : readText(value, "targetCommandId", 128);
+  const targetCommandId = readText(value, "targetCommandId", 128);
   if (disposition === SessionPromptDisposition.Reject && targetCommandId.length > 0 || disposition !== SessionPromptDisposition.Reject && !isIdentifier(targetCommandId)) {
     throw new ProtocolMessageError("Prompt disposition has an invalid target command");
   }
@@ -21387,9 +21382,7 @@ function decodeSessionPromptCommand(encoded) {
     directoryId: readDirectoryIdentifier(value, "directoryId"),
     disposition,
     attachments,
-    ...value["historyPolicy"] === void 0 ? {} : {
-      historyPolicy: readHistoryPolicy(value)
-    },
+    historyPolicy: readHistoryPolicy(value),
     kind: SESSION_PROMPT_KIND,
     prompt,
     ...hasSessionConfigurations ? { sessionConfigurations } : {},
@@ -21459,8 +21452,8 @@ var activeTurnSnapshotSchema = external_exports.object({
   epoch: identifierStringSchema,
   interaction: external_exports.discriminatedUnion("kind", [sessionPermissionRequestedEventSchema, sessionElicitationRequestedEventSchema]).nullable(),
   sequence: external_exports.number().int().nonnegative(),
-  // When the turn started, as the Runtime recorded it. Absent from older Runtimes.
-  startedAt: external_exports.iso.datetime({ offset: true }).optional(),
+  // When the Runtime recorded the start of this running turn.
+  startedAt: external_exports.iso.datetime({ offset: true }),
   state: external_exports.literal("running")
 }).readonly();
 var commandDeliverySchema = external_exports.discriminatedUnion("state", [
@@ -22663,15 +22656,11 @@ function decodeInstallationPointer(value) {
   }
   return { installationId: validateInstallationId(storedInstallationId) };
 }
-function retainedFields(value, keys) {
-  return Object.fromEntries(keys.filter((key) => Object.hasOwn(value, key)).map((key) => [key, value[key]]));
-}
-function decodeChannelIndex(input2) {
-  if (!isRecord3(input2)) {
+function decodeChannelIndex(value) {
+  if (!isRecord3(value)) {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
-  const value = input2["version"] === 1 ? retainedFields(input2, CHANNEL_INDEX_KEYS) : input2;
-  if (!hasExactKeys(value, CHANNEL_INDEX_KEYS) || value["version"] !== 1 && value["version"] !== 2) {
+  if (!hasExactKeys(value, CHANNEL_INDEX_KEYS) || value["version"] !== 2) {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
   const channelId = value["channelId"];
@@ -22687,7 +22676,7 @@ function decodeChannelIndex(input2) {
   };
 }
 function decodeVerifiedConnection(value) {
-  if (!hasExactKeys(value, VERIFIED_CONNECTION_KEYS) || value["version"] !== 5 && value["version"] !== 6 || value["kind"] !== "verified") {
+  if (!hasExactKeys(value, VERIFIED_CONNECTION_KEYS) || value["version"] !== 6 || value["kind"] !== "verified") {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
   const activation = value["activation"];
@@ -22720,7 +22709,7 @@ function decodeConnection(value) {
   if (!isRecord3(value)) {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
-  return decodeVerifiedConnection(value["version"] === 5 ? retainedFields(value, VERIFIED_CONNECTION_KEYS) : value);
+  return decodeVerifiedConnection(value);
 }
 async function readJsonFile(path7, signal, missingCode) {
   signal.throwIfAborted();
@@ -88629,7 +88618,6 @@ async function unchangedIdentity(agent2, signal) {
 var PAIRING_TIMEOUT_MILLISECONDS = 2e4;
 var PAIRING_CODE_PATTERN = /^[A-HJ-NP-Z2-9]{4}(?:-[A-HJ-NP-Z2-9]{4}){4}$/;
 var TOKEN_PATTERN = /^[a-zA-Z0-9_-]{32,256}$/;
-var CLAIM_RESPONSE_KEYS = ["appId", "channelId", "daemonToken", "runtimeId"];
 var REDEEM_RESPONSE_KEYS = ["appId", "channelId", "runtimeCredential", "runtimeId"];
 var PairingClientError = class extends Error {
   code;
@@ -88722,13 +88710,13 @@ function readRelayError(value) {
   }
   return new PairingClientError("pairing_failed", "The relay could not pair this machine");
 }
-function decodePairingResponse(value, credentialField, expectedKeys) {
-  if (!isRecord5(value) || !hasExactKeys2(value, expectedKeys)) {
+function decodePairingResponse(value) {
+  if (!isRecord5(value) || !hasExactKeys2(value, REDEEM_RESPONSE_KEYS)) {
     throw new PairingClientError("invalid_relay_response", "The relay returned an invalid pairing response");
   }
   const appId = value["appId"];
   const channelId = value["channelId"];
-  const runtimeCredential2 = value[credentialField];
+  const runtimeCredential2 = value["runtimeCredential"];
   const runtimeId = value["runtimeId"];
   if (typeof appId !== "string" || !isIdentifier(appId) || typeof channelId !== "string" || !isIdentifier(channelId) || typeof runtimeCredential2 !== "string" || !TOKEN_PATTERN.test(runtimeCredential2) || typeof runtimeId !== "string" || !isIdentifier(runtimeId)) {
     throw new PairingClientError("invalid_relay_response", "The relay returned an invalid pairing response");
@@ -88743,7 +88731,10 @@ async function claimPairing(options, defaultWorkspace, localAgents, signal) {
     id: agent2.id,
     label: agent2.label
   }));
-  const endpoint = options.pairingId.length > 0 ? mortyApiUrl(options.relayOrigin, `/v1/runtime-pairings/${encodeURIComponent(options.pairingId)}/redeem`) : mortyApiUrl(options.relayOrigin, "/pairings/claim");
+  const endpoint = mortyApiUrl(
+    options.relayOrigin,
+    `/v1/runtime-pairings/${encodeURIComponent(options.pairingId)}/redeem`
+  );
   let response;
   try {
     response = await fetch3(endpoint, {
@@ -88766,7 +88757,7 @@ async function claimPairing(options, defaultWorkspace, localAgents, signal) {
   if (!response.ok) {
     throw readRelayError(value);
   }
-  return options.pairingId.length > 0 ? decodePairingResponse(value, "runtimeCredential", REDEEM_RESPONSE_KEYS) : decodePairingResponse(value, "daemonToken", CLAIM_RESPONSE_KEYS);
+  return decodePairingResponse(value);
 }
 function buildSavedRuntimeConfig(connection, defaultWorkspace, inventory, localContext) {
   const relayUrl = mortyApiUrl(connection.relayOrigin, "/v1/runtimes/connect");
@@ -88835,7 +88826,7 @@ async function pairRuntimeConnection(installation, options, signal, environment)
     installation,
     {
       code: parsePairingCode(options.pairingCode),
-      pairingId: options.pairingId.length === 0 ? "" : validatePairingId(options.pairingId),
+      pairingId: validatePairingId(options.pairingId),
       relayOrigin: parseRelayOrigin2(options.relayOrigin),
       workspace: options.defaultWorkspace
     },
@@ -92319,6 +92310,14 @@ var NativeSessionService = class {
   };
 };
 
+// src/engine/session/api/session-error.ts
+var SessionError = class extends OperationError {
+  constructor(code, message, options = {}) {
+    super(code, message, options);
+    this.name = "SessionError";
+  }
+};
+
 // src/engine/session/prompt/prompt-artifacts.ts
 import { createHash as createHash7 } from "node:crypto";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
@@ -92501,7 +92500,7 @@ var PromptLifecycle = class {
   /**
    * Publishes again an outcome a receipt already holds, for clients that missed it. The restatement is marked, so
    * status notifications do not take it for a new outcome, and it does not settle the receipt again. It keeps the
-   * time the outcome was recorded, which receivers that predate the marker report as when it ended; only an outcome
+   * time the outcome was recorded; only an outcome
    * a receipt recorded is marked as such, so Recording can settle a Turn it missed from it and never from an
    * acknowledgement composed now.
    */
@@ -92587,6 +92586,11 @@ async function settleAbandonedTurn(projection, operations, cancellation) {
     case "restated":
       projection.restateOutcome(cancellation.sessionId, cancelled.outcome);
       return;
+    case "expired":
+      throw new SessionError(
+        "command_result_expired",
+        "The command executed but its result is no longer retained"
+      );
     case "unavailable":
       break;
   }
@@ -92896,16 +92900,7 @@ var ExecutionReceipts = class {
         return outcome2 === void 0 ? { kind: "unavailable" } : { kind: "restated", outcome: outcome2 };
       }
       case "expired":
-        return {
-          kind: "restated",
-          outcome: {
-            event: {
-              type: "lifecycle-metadata",
-              payload: { kind: "prompt.completed", commandId, stopReason: "cancelled" }
-            },
-            recordedAt: void 0
-          }
-        };
+        return { kind: "expired" };
       case "cancelled":
         return {
           kind: "restated",
@@ -93245,16 +93240,16 @@ var ActiveRuntimeTurn = class {
     return event;
   };
   snapshot = () => {
-    if (!this.#started()) {
+    const startedAt = this.#startedAt();
+    if (startedAt === void 0) {
       return null;
     }
-    const startedAt = this.#startedAt();
     return {
       commandId: decodeIdentifier(this.command.commandId),
       epoch: this.epoch,
       interaction: this.#interaction,
       sequence: this.#sequence,
-      ...startedAt === void 0 ? {} : { startedAt },
+      startedAt,
       state: "running"
     };
   };
@@ -94634,14 +94629,6 @@ function createAgentCatalogCommands(context) {
 // src/engine/runtime/command/agent-settings-discovery.ts
 import { WebSocket as WebSocket4 } from "undici";
 
-// src/engine/session/api/session-error.ts
-var SessionError = class extends OperationError {
-  constructor(code, message, options = {}) {
-    super(code, message, options);
-    this.name = "SessionError";
-  }
-};
-
 // src/engine/session/settings/discover-agent-settings.ts
 import { createHash as createHash10 } from "node:crypto";
 
@@ -95438,6 +95425,7 @@ async function loadHistoryPage(sessionId, eventLimit, initialCursor, queuedPromp
   return {
     events: {
       events: orderedEvents.map(({ event }) => event),
+      promptOutcomes: [],
       nextCursor,
       sessionGenerationId,
       tailCursor: orderedEvents.at(-1)?.event.eventId ?? "",
@@ -95596,14 +95584,14 @@ var previewHistoryPageLoadCommand = {
 // src/engine/runtime/command/registry/interactions.ts
 var sessionCancelCommand = {
   kind: SESSION_CANCEL_KIND,
-  handle: ({ eventProjection, operations, sessions, sessionTurns, signal }, message) => {
+  handle: ({ eventProjection, operations, sessions, sessionTurns, signal, socket }, message) => {
     if (message.kind !== SESSION_CANCEL_KIND) {
       throw new Error("Command kind mismatch");
     }
     const turn = sessionTurns.get(message.commandId, message.sessionId);
     if (turn === void 0) {
       void settleAbandonedTurn(eventProjection, operations, message).catch((error62) => {
-        console.error("Could not settle abandoned turn", error62);
+        reportOperationFailure(socket, message.commandId, message.sessionId, error62);
       });
       return;
     }
@@ -95634,7 +95622,7 @@ var sessionCancelBeforeStartCommand = {
     const turn = sessionTurns.get(message.commandId, message.sessionId);
     if (turn === void 0) {
       const cancelled = operations.recordCancellationBeforeAdmission(message.commandId, message.sessionId);
-      const outcome = cancelled.kind === "unavailable" ? void 0 : cancelled.kind === "restated" ? cancelled.outcome.event : cancelled.outcome;
+      const outcome = cancelled.kind === "unavailable" || cancelled.kind === "expired" ? void 0 : cancelled.kind === "restated" ? cancelled.outcome.event : cancelled.outcome;
       if (outcome?.type === "lifecycle-metadata" && outcome.payload.kind === "prompt.completed" && promptCompletion(outcome.payload).kind === "cancelled") {
         if (cancelled.kind === "restated") {
           eventProjection.restateOutcome(message.sessionId, cancelled.outcome);
@@ -95728,8 +95716,7 @@ function createNativeSessionRequestHandler(dependencies) {
   };
   const handle = (command) => {
     const previous = [...pending.values()].filter((request) => request.agentId === command.agentId);
-    const parallelRead = command.action === "active-turn";
-    if (pending.has(command.requestId) || pending.size >= 4 || !parallelRead && previous.some((request) => !request.controller.signal.aborted)) {
+    if (pending.has(command.requestId) || pending.size >= 4) {
       reportOperationFailure(
         socket,
         command.requestId,
@@ -97937,4 +97924,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-MBS25BBY.js.map
+//# sourceMappingURL=chunk-OCDHOJ7L.js.map