@skrr-ai/cli 0.1.71 → 0.1.72

package/dist/base-command.js

@@ -1322,6 +1322,7 @@ class BaseCommand extends core_1.Command {
                     exit: 1,
                     retryable: isRetryableFailure(e.status, body),
                     details: body ?? undefined,
+                    requestId: stringProp(body, 'requestId') || e.requestId,
                 });
             }
             else if ((0, outbox_1.isOutageFailure)(e)) {

package/dist/commands/agents/chat.js

@@ -14,6 +14,7 @@ const node_fs_1 = require("node:fs");
 const core_1 = require("@oclif/core");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
+const api_fetch_1 = require("../../lib/api-fetch");
 const agent_home_workspace_1 = require("../../lib/agent-home-workspace");
 const agentic_stream_1 = require("../../lib/agentic-stream");
 const web_url_1 = require("../../lib/web-url");
@@ -594,6 +595,7 @@ class AgentsChat extends base_command_1.BaseCommand {
             quiet,
             approveTools: flags['approve-tools'],
             reconcileTerminal,
+            replayEnvelopes: (from) => (0, api_fetch_1.apiFetch)(`/api/agentic/sessions/${encodeURIComponent(started.sessionId)}/envelopes?from=${from}&limit=500`, { credential: this.resolvedCredential, signal: AbortSignal.timeout(5000) }),
         });
         // OSK-2938 — Ctrl-C must be bounded, visible, and honest about what it
         // did NOT stop.

package/dist/commands/machines/dedicated/cp.js

@@ -105,6 +105,9 @@ class DedicatedMachinesCp extends base_command_1.BaseCommand {
             if (err instanceof dedicated_copy_1.DedicatedCopyError) {
                 this.error(err.message, { exit: 1, code: err.code });
             }
+            // Keep the API status, request id and explicit retry decision together.
+            if ((0, base_command_1.apiRefusal)(err).body?.retryable === true)
+                this.handleApiError(err);
             const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
             if (message)
                 this.error(message, { exit: 1, code: (0, dedicated_machines_1.dedicatedRuntimeApiErrorCode)(err) });

package/dist/commands/machines/dedicated/exec.js

@@ -154,6 +154,9 @@ class DedicatedMachinesExec extends base_command_1.BaseCommand {
                 err instanceof dedicated_exec_1.DedicatedExecIdempotencyUnsupportedError) {
                 this.error(err.message, { exit: 1, code: err.code });
             }
+            // Keep the API status, request id and explicit retry decision together.
+            if ((0, base_command_1.apiRefusal)(err).body?.retryable === true)
+                this.handleApiError(err);
             const message = (0, dedicated_machines_1.formatDedicatedRuntimeApiError)(err);
             if (message)
                 this.error(message, { exit: 1, code: (0, dedicated_machines_1.dedicatedRuntimeApiErrorCode)(err) });

package/dist/lib/agentic-stream.d.ts

@@ -60,6 +60,12 @@ export type ReconciledTerminal = {
  * drift (OSK-7629).
  */
 export declare function writeJsonLine(output: NodeJS.WritableStream, value: unknown): void;
+export type EnvelopeReplayPage = {
+    envelopes: unknown[];
+    hasMore?: boolean;
+    nextSeq?: number;
+    gap?: boolean;
+};
 export type AgenticStreamOptions = {
     baseURL: string;
     token: string;
@@ -89,6 +95,10 @@ export type AgenticStreamOptions = {
      * the stream alone.
      */
     reconcileTerminal?: () => Promise<ReconciledTerminal | null>;
+    /** Owner-authorized canonical envelopes, including events emitted before room admission. */
+    replayEnvelopes?: (from: number) => Promise<EnvelopeReplayPage>;
+    /** Bounded live catch-up cadence while a run is active. Default 2s. */
+    envelopeReplayIntervalMs?: number;
     /** Silence before the first durable-record probe. Default 20s. */
     idleTerminalProbeMs?: number;
     /** How long to keep trying to attach before reporting a detach. Default 30s. */
@@ -376,6 +386,12 @@ export declare class AgenticStreamClient {
     private accumulated;
     /** Highest envelope `__seq` folded into `accumulated`, for gap detection. */
     private highestSeq;
+    private readonly pendingEnvelopes;
+    private replayTimer;
+    private replayFlight;
+    private replayGeneration;
+    private replayFailures;
+    private finishingReplay;
     private reportedGap;
     private readonly seenEnvelopes;
     /**
@@ -487,6 +503,12 @@ export declare class AgenticStreamClient {
      * what the run reports — only what the reader is told while it is happening.
      */
     private reportSeqGap;
+    /** Keep later live frames behind missing earlier frames while canonical replay catches up. */
+    private receiveSessionOutput;
+    private flushPendingEnvelopes;
+    /** Poll even while a tool is quiet: a pre-join start has no later live event to reveal its gap. */
+    private catchUpEnvelopes;
+    private applySessionOutput;
     private installHandlers;
     private handlePermission;
     private handleQuestion;
@@ -534,6 +556,7 @@ export declare class AgenticStreamClient {
     private emitToolEvent;
     private emit;
     private finish;
+    private finishAfterReplay;
     /**
      * The answer as the durable record holds it, for a run whose stream had a
      * hole. Bounded: the record is written before the terminal event is sent, so

package/dist/lib/agentic-stream.js

@@ -628,6 +628,12 @@ class AgenticStreamClient {
     accumulated = '';
     /** Highest envelope `__seq` folded into `accumulated`, for gap detection. */
     highestSeq = 0;
+    pendingEnvelopes = new Map();
+    replayTimer = null;
+    replayFlight = null;
+    replayGeneration = 0;
+    replayFailures = 0;
+    finishingReplay = false;
     reportedGap = false;
     // Envelope keys already applied, so a re-delivered `session:output` frame is
     // not appended twice (OSK-4834). Cleared on `execution:stream-reset`.
@@ -726,6 +732,7 @@ class AgenticStreamClient {
         this.socket.emit('session:join', this.sessionJoinPayload());
         this.emit({ type: 'session.joined', sessionId: this.options.sessionId });
         this.armIdleProbe();
+        void this.catchUpEnvelopes();
         return result;
     }
     /**
@@ -835,6 +842,10 @@ class AgenticStreamClient {
             clearTimeout(this.idleTimer);
             this.idleTimer = null;
         }
+        if (this.replayTimer)
+            clearTimeout(this.replayTimer);
+        this.replayTimer = null;
+        this.pendingEnvelopes.clear();
         this.abandonConnectWait?.();
         const socket = this.socket;
         this.socket = null;
@@ -883,12 +894,145 @@ class AgenticStreamClient {
                 this.highestSeq = seq;
         }
     }
+    /** Keep later live frames behind missing earlier frames while canonical replay catches up. */
+    receiveSessionOutput(event) {
+        if (this.closed || this.settled)
+            return;
+        const envelopes = event.envelopes;
+        if (!this.options.replayEnvelopes || !Array.isArray(envelopes)) {
+            this.applySessionOutput(event);
+            return;
+        }
+        for (const envelope of envelopes) {
+            const seq = Number(envelope?.__seq);
+            if (!Number.isSafeInteger(seq) || seq <= 0) {
+                this.applySessionOutput({ ...event, envelopes: [envelope] });
+            }
+            else if (seq > this.highestSeq && !this.pendingEnvelopes.has(seq)) {
+                this.pendingEnvelopes.set(seq, { envelope, event });
+            }
+        }
+        this.flushPendingEnvelopes(false);
+        if (this.pendingEnvelopes.size > 2000)
+            this.flushPendingEnvelopes(true);
+        if (this.pendingEnvelopes.size)
+            void this.catchUpEnvelopes();
+    }
+    flushPendingEnvelopes(allowGap, through = Infinity) {
+        const seqs = [...this.pendingEnvelopes.keys()].sort((a, b) => a - b);
+        for (const seq of seqs) {
+            if (seq > through)
+                break;
+            if (!allowGap && seq !== this.highestSeq + 1)
+                break;
+            const item = this.pendingEnvelopes.get(seq);
+            this.pendingEnvelopes.delete(seq);
+            this.applySessionOutput({ ...item.event, envelopes: [item.envelope] });
+        }
+    }
+    /** Poll even while a tool is quiet: a pre-join start has no later live event to reveal its gap. */
+    catchUpEnvelopes() {
+        if (!this.options.replayEnvelopes || this.closed || this.settled)
+            return Promise.resolve();
+        if (this.replayFlight)
+            return this.replayFlight;
+        if (this.replayTimer)
+            clearTimeout(this.replayTimer);
+        this.replayTimer = null;
+        const generation = this.replayGeneration;
+        this.replayFlight = (async () => {
+            try {
+                for (let page = 0; page < 4; page += 1) {
+                    const from = this.highestSeq;
+                    const result = await this.options.replayEnvelopes(from);
+                    if (this.closed || this.settled || generation !== this.replayGeneration)
+                        return;
+                    this.replayFailures = 0;
+                    this.receiveSessionOutput({ type: 'session.output', sessionId: this.options.sessionId, source: 'replay', envelopes: result.envelopes });
+                    // The canonical endpoint explicitly identifies retention gaps. Only
+                    // then may later frames pass with the existing honest gap notice.
+                    if (result.gap) {
+                        // A retention gap proves only this page, never a later live frame.
+                        const pageSeqs = result.envelopes.map((e) => Number(e?.__seq)).filter(Number.isSafeInteger);
+                        if (pageSeqs.length)
+                            this.flushPendingEnvelopes(true, Math.max(...pageSeqs));
+                        this.flushPendingEnvelopes(false);
+                    }
+                    if (!result.hasMore || this.highestSeq <= from)
+                        break;
+                }
+            }
+            catch {
+                // Recovery failure says nothing about the producer. After bounded
+                // retries retain the existing live/gap/final-record fallback.
+                this.replayFailures += 1;
+                if (this.replayFailures >= 3)
+                    this.flushPendingEnvelopes(true);
+            }
+        })().finally(() => {
+            this.replayFlight = null;
+            if (!this.closed && !this.settled && !this.finishingReplay) {
+                this.replayTimer = setTimeout(() => void this.catchUpEnvelopes(), this.options.envelopeReplayIntervalMs ?? 2000);
+            }
+        });
+        return this.replayFlight;
+    }
+    applySessionOutput(event) {
+        // The agent's words arrive HERE for agentic runs, inside `envelopes`, and
+        // `event.text` is null. Normalising the frame without reading them meant
+        // `skrr agents chat` printed two header lines and exited having shown
+        // nothing, while the agent had answered perfectly — and `--no-stream
+        // --json` returned `status: completed` with `response: ""`.
+        //
+        // Only `ev.t === 'text'` counts. The same envelope stream carries tool
+        // and status frames, and folding those into the answer would put machine
+        // chatter in `response`.
+        // Dedupe re-delivered envelopes (session room + user room + join replay):
+        // append and reprint only the ones we have not applied yet (OSK-4834).
+        const rawEnvelopes = event.envelopes;
+        if (Array.isArray(rawEnvelopes) && rawEnvelopes.length > 0) {
+            const fresh = unseenEnvelopes(event, this.seenEnvelopes);
+            if (fresh.length === 0)
+                return; // a pure re-delivery — drop it whole
+            const scoped = { ...event, envelopes: fresh };
+            // Say what never arrived, once, before folding this batch in
+            // (OSK-7631). Checked against the FRESH set: a re-delivery carries old
+            // seqs and would read as a gap that never happened.
+            this.reportSeqGap(fresh);
+            const envelopeText = envelopesText(scoped);
+            if (envelopeText) {
+                this.accumulated += envelopeText;
+                this.emit({ ...scoped, type: 'text.delta', text: this.accumulated });
+            }
+            // A daemon-routed turn carries its tool calls HERE and nowhere else.
+            // Projecting them gives both execution paths one vocabulary (OSK-7730).
+            for (const projected of projectDaemonToolEvents(fresh, this.toolNamesByCall)) {
+                this.emitToolEvent({ ...projected, sessionId: this.options.sessionId });
+            }
+            // Notices meant for the person — a local harness that could not resume
+            // its previous session and started a fresh one (OSK-12131). A plain
+            // `service` line is diagnostic chatter and stays in the envelope; one
+            // marked `notice` is said out loud.
+            for (const notice of projectSessionNotices(fresh)) {
+                this.emit({ ...notice, sessionId: this.options.sessionId });
+            }
+            // Who decided each permission request — a person (and where), the
+            // mode, a policy — said beside the decision (OSK-12113).
+            for (const resolved of projectPermissionResolutions(fresh, this.toolNamesByPermission)) {
+                this.emit({ ...resolved, sessionId: this.options.sessionId });
+            }
+            this.emit({ ...scoped, type: 'session.output' });
+            return;
+        }
+        this.emit({ ...event, type: 'session.output' });
+    }
     installHandlers() {
         const socket = this.socket;
         const match = (event) => !event.sessionId || event.sessionId === this.options.sessionId;
         socket.on('connect', () => {
             socket.emit('session:join', this.sessionJoinPayload());
             this.emit({ type: 'transport.connected', sessionId: this.options.sessionId });
+            void this.catchUpEnvelopes();
         });
         socket.on('disconnect', (reason) => {
             this.transportDropped = true;
@@ -942,55 +1086,8 @@ class AgenticStreamClient {
             this.emit({ ...event, type: 'text.delta' });
         });
         socket.on('session:output', (event) => {
-            if (!match(event))
-                return;
-            // The agent's words arrive HERE for agentic runs, inside `envelopes`, and
-            // `event.text` is null. Normalising the frame without reading them meant
-            // `skrr agents chat` printed two header lines and exited having shown
-            // nothing, while the agent had answered perfectly — and `--no-stream
-            // --json` returned `status: completed` with `response: ""`.
-            //
-            // Only `ev.t === 'text'` counts. The same envelope stream carries tool
-            // and status frames, and folding those into the answer would put machine
-            // chatter in `response`.
-            // Dedupe re-delivered envelopes (session room + user room + join replay):
-            // append and reprint only the ones we have not applied yet (OSK-4834).
-            const rawEnvelopes = event.envelopes;
-            if (Array.isArray(rawEnvelopes) && rawEnvelopes.length > 0) {
-                const fresh = unseenEnvelopes(event, this.seenEnvelopes);
-                if (fresh.length === 0)
-                    return; // a pure re-delivery — drop it whole
-                const scoped = { ...event, envelopes: fresh };
-                // Say what never arrived, once, before folding this batch in
-                // (OSK-7631). Checked against the FRESH set: a re-delivery carries old
-                // seqs and would read as a gap that never happened.
-                this.reportSeqGap(fresh);
-                const envelopeText = envelopesText(scoped);
-                if (envelopeText) {
-                    this.accumulated += envelopeText;
-                    this.emit({ ...scoped, type: 'text.delta', text: this.accumulated });
-                }
-                // A daemon-routed turn carries its tool calls HERE and nowhere else.
-                // Projecting them gives both execution paths one vocabulary (OSK-7730).
-                for (const projected of projectDaemonToolEvents(fresh, this.toolNamesByCall)) {
-                    this.emitToolEvent({ ...projected, sessionId: this.options.sessionId });
-                }
-                // Notices meant for the person — a local harness that could not resume
-                // its previous session and started a fresh one (OSK-12131). A plain
-                // `service` line is diagnostic chatter and stays in the envelope; one
-                // marked `notice` is said out loud.
-                for (const notice of projectSessionNotices(fresh)) {
-                    this.emit({ ...notice, sessionId: this.options.sessionId });
-                }
-                // Who decided each permission request — a person (and where), the
-                // mode, a policy — said beside the decision (OSK-12113).
-                for (const resolved of projectPermissionResolutions(fresh, this.toolNamesByPermission)) {
-                    this.emit({ ...resolved, sessionId: this.options.sessionId });
-                }
-                this.emit({ ...scoped, type: 'session.output' });
-                return;
-            }
-            this.emit({ ...event, type: 'session.output' });
+            if (match(event))
+                this.receiveSessionOutput(event);
         });
         socket.on('tool:start', (event) => {
             if (match(event))
@@ -1011,6 +1108,8 @@ class AgenticStreamClient {
             this.renderedText = '';
             // Seqs restart with the stream, so a fresh low seq is not a gap.
             this.highestSeq = 0;
+            this.replayGeneration += 1;
+            this.pendingEnvelopes.clear();
             this.reportedGap = false;
             // A reset restarts the stream, so envelope seqs may repeat; forget the
             // seen keys or the fresh post-reset text would be deduped away (OSK-4834).
@@ -1429,6 +1528,27 @@ class AgenticStreamClient {
         }
     }
     finish(status, event) {
+        if (this.settled || this.finishingReplay)
+            return;
+        if (this.options.replayEnvelopes) {
+            this.finishingReplay = true;
+            const activeReplay = this.replayFlight;
+            void (async () => {
+                if (activeReplay)
+                    await activeReplay;
+                // A request already in flight may have read before the terminal event.
+                await this.catchUpEnvelopes();
+            })().finally(() => {
+                if (this.closed || this.settled)
+                    return;
+                this.flushPendingEnvelopes(true);
+                this.finishAfterReplay(status, event);
+            });
+            return;
+        }
+        this.finishAfterReplay(status, event);
+    }
+    finishAfterReplay(status, event) {
         if (this.settled)
             return;
         this.settled = true;

package/dist/node_modules/@skrr-ai/data-provider/index.js

@@ -39213,7 +39213,7 @@ var pf = { notify: { label: "Notice", detail: "Installers are told about a probl
 var mf = { active: { label: "In force", detail: "The remedy applies to every copy running this release." }, lifted: { label: "Lifted", detail: "Two curators lifted the remedy. Copies running this release run as before." }, retracted: { label: "Retracted", detail: "Two curators retracted this advisory as issued in error. It no longer applies." } };
 var ff = Object.freeze(["name", "description", "instructions", "promptComposition", "avatar", "character3DId", "provider", "model", "model_parameters", "artifacts", "access_level", "recursion_limit", "tools", "tool_kwargs", "actions", "hide_sequential_outputs", "end_after_tools", "agent_ids", "network_mode", "network_agent_ids", "network_agent_release_pins", "network_include_public", "conversation_starters", "agentActions", "tool_resources", "category", "support_contact", "shareMode", "skills", "allowedCapabilities", "toolPolicy", "commitmentResponsibilityDefault", "commitmentResponsibilityCeiling", "reasoningToolEscapes", "executionPolicy", "workingDirectory", "defaultPermissionMode", "todoWorkingHours", "welcomeMessage", "installFirstContact", "serviceDelivery", "proactiveInstall", "marketplaceMedia"]);
 var gf = Object.freeze(["executionPolicy", "workingDirectory", "defaultPermissionMode", "tool_resources", "marketplaceMedia"]);
-var vf = Object.freeze(["isAlwaysOn", "alwaysOnControl", "defaultForHarness", "nativeRole", "marketplaceStoreSourceState", "marketplaceStoreSourceReleaseId", "network_shell_write_agent_ids", "installKind"]);
+var vf = Object.freeze(["isAlwaysOn", "alwaysOnControl", "defaultForHarness", "nativeRole", "marketplaceStoreSourceState", "marketplaceStoreSourceReleaseId", "network_shell_write_agent_ids", "installKind", "marketplaceSpaceId"]);
 var hf = Object.freeze(["_id", "id", "author", "authorName", "workspaceId", "createdAt", "updatedAt", "price", "rating", "ratingCount", "installCount", "is_listed", "is_promoted", "storeFeaturedPlacement", "is_banned", "banned_at", "banned_by", "delisted_at", "delisted_by", "versions", "latestReleaseId", "latestPublicReleaseId", "latestVersionLabel", "installedReleaseId", "forkedFrom", "forkedFromReleaseId", "forkedFromVersionLabel", "releasePolicy", "storeInstallState", "storeInstallReservationId", "storeInstallSourceAgentId", "storeInstallReleaseId", "storeInstallWorkspaceId", "storeInstallReservedAt", "storeInstallExpiresAt", "storeInstallCompletedAt", "storeInstallSharedMemoryDefault", "marketplaceEntitlementState", "marketplaceEntitlementEvidence", "marketplaceFulfillmentState", "marketplaceTeamOrderId", "learnedCapabilityProfile", "directModeRegret", "toneMode", "toneId", "toneNotes", "sceneBackground", "maxTurns", "maxConcurrentTaskExecutions", "projectIds", "isCollaborative", "is_onboarding", "mgmtVersion", "mgmtPublishedAt", "mgmtPublic"]);
 var yf = Object.freeze(ff.filter(function(e2) {
   return !gf.includes(e2);
@@ -41849,7 +41849,7 @@ function FE(e2, t2, n2, o2, r2) {
         var l2 = WE(e3.parts), u2 = r3 ? { id: n3(), kind: "thinking", text: t3.text, status: "streaming" } : { id: n3(), kind: "text", text: t3.text, status: "streaming" };
         return S(S({}, e3), { parts: w(w([], l2, true), [u2], false), updatedAt: o3 });
       })(e2, t2, o2, r2);
-      return e2.pending ? a2 : S(S({}, a2), { parts: WE(a2.parts) });
+      return e2.status ? S(S({}, a2), { pending: false, parts: WE(a2.parts) }) : S(S({}, a2), { pending: "agent" === e2.role || e2.pending });
     case "service":
     case "session-handoff":
     case "slash-commands-available":
@@ -41908,7 +41908,7 @@ function FE(e2, t2, n2, o2, r2) {
         return S(S({}, e3), { parts: g2, pending: BE(g2), updatedAt: o3 });
       })(e2, t2, o2, r2);
     case "turn-start":
-      return S(S({}, e2), { pending: true, updatedAt: r2 });
+      return S(S({}, e2), { pending: true, status: void 0, updatedAt: r2 });
     case "turn-end":
       return (function(e3, t3, n3) {
         var o3 = (function(e4, t4, n4) {
@@ -45139,10 +45139,10 @@ var gR = Object.freeze({ __proto__: null, acceptAgentIntuition: function(e2, t2,
     return "".concat(er(), "/agents/").concat(e3, "/install");
   })(t2), { releaseId: n2, spaceId: o2, fork: r2, includeBootstrap: a2, includeMemory: i2, proactiveInstall: s2, preinstallReservationId: c2, reservedInstalledAgentId: l2, expectedOfferVersionId: u2, expectedPrice: d2, executionPlacement: p2, outcomeSharing: m2, shareMemory: f2 });
 }, installStoreService: function(e2) {
-  var t2 = e2.listingId, n2 = e2.title, o2 = e2.agentMapping;
+  var t2 = e2.listingId, n2 = e2.title, o2 = e2.agentMapping, r2 = e2.acknowledgedRequirements;
   return oR.post((function(e3) {
     return "".concat(er(), "/services/").concat(encodeURIComponent(e3), "/install");
-  })(t2), { title: n2, agentMapping: o2 });
+  })(t2), { title: n2, agentMapping: o2, acknowledgedRequirements: r2 });
 }, installStoreTeam: function(e2) {
   var t2 = e2.teamId, n2 = e2.spaceId;
   return oR.post((function(e3) {
@@ -48842,18 +48842,21 @@ exports.describeStoreReleaseAdvisoryStatus = function(e2) {
   }), d2 = new Set(e2.semantic.nodes.map(function(e3) {
     return e3.key;
   })), p2 = e2.semantic.nodes.map(function(e3) {
-    for (var t3, n3, o3, r3, a3 = null !== (t3 = dv[e3.type]) && void 0 !== t3 ? t3 : {}, u3 = S({}, null !== (n3 = e3.config) && void 0 !== n3 ? n3 : {}), d3 = 0, p3 = Object.entries(a3); d3 < p3.length; d3++) {
-      var m3 = p3[d3], f3 = m3[0], g3 = m3[1];
-      if ("keep" !== g3.action) {
-        var v3 = Object.prototype.hasOwnProperty.call(u3, f3), h3 = u3[f3];
-        if (i2.has("".concat(e3.key, ".").concat(f3))) v3 && !pv(h3) && s2.push({ nodeKey: e3.key, configPath: f3, kind: "blank", message: "".concat(e3.key, ".").concat(f3, " keeps a concrete value, so this template only works where that value exists") });
-        else if ("blank" !== g3.action) {
-          var y3 = v3 && !pv(h3), b3 = null === (o3 = g3.required) || void 0 === o3 || o3;
-          (b3 || y3) && (u3[f3] = g3.empty, c2.push({ ref: fv(e3.key, f3, l2), kind: g3.kind, label: g3.label, required: b3, nodeKey: e3.key, configPath: f3, multiple: null !== (r3 = g3.multiple) && void 0 !== r3 && r3 }), y3 && s2.push({ nodeKey: e3.key, configPath: f3, kind: "slot", message: "".concat(g3.label, " on ").concat(e3.key, " will be asked for when this template is inserted") }));
-        } else v3 && (void 0 === g3.empty ? delete u3[f3] : u3[f3] = g3.empty);
-      }
-    }
-    return S(S({}, e3), { config: u3 });
+    for (var n3, o3, r3, a3, u3, d3 = null !== (n3 = dv[e3.type]) && void 0 !== n3 ? n3 : {}, p3 = S({}, null !== (o3 = e3.config) && void 0 !== o3 ? o3 : {}), m3 = function(n4, o4) {
+      if ("keep" === o4.action) return "continue";
+      var d4 = Object.prototype.hasOwnProperty.call(p3, n4), m4 = p3[n4];
+      if (i2.has("".concat(e3.key, ".").concat(n4))) return d4 && !pv(m4) && s2.push({ nodeKey: e3.key, configPath: n4, kind: "blank", message: "".concat(e3.key, ".").concat(n4, " keeps a concrete value, so this template only works where that value exists") }), "continue";
+      if ("blank" === o4.action) return d4 && (void 0 === o4.empty ? delete p3[n4] : p3[n4] = o4.empty), "continue";
+      var f4 = d4 && !pv(m4), g4 = null === (r3 = o4.required) || void 0 === r3 || r3, v4 = null === (a3 = null == t2 ? void 0 : t2.preserveSlots) || void 0 === a3 ? void 0 : a3.find(function(t3) {
+        return t3.nodeKey === e3.key && t3.configPath === n4 && t3.kind === o4.kind;
+      });
+      if (!g4 && !f4 && !v4) return "continue";
+      p3[n4] = o4.empty, c2.push({ ref: (null == v4 ? void 0 : v4.ref) && /^[a-zA-Z0-9_-]{1,200}$/.test(v4.ref) && !l2.has(v4.ref) ? (l2.add(v4.ref), v4.ref) : fv(e3.key, n4, l2), kind: o4.kind, label: o4.label, required: g4, nodeKey: e3.key, configPath: n4, multiple: null !== (u3 = o4.multiple) && void 0 !== u3 && u3 }), f4 && s2.push({ nodeKey: e3.key, configPath: n4, kind: "slot", message: "".concat(o4.label, " on ").concat(e3.key, " will be asked for when this template is inserted") });
+    }, f3 = 0, g3 = Object.entries(d3); f3 < g3.length; f3++) {
+      var v3 = g3[f3];
+      m3(v3[0], v3[1]);
+    }
+    return S(S({}, e3), { config: p3 });
   }), m2 = /* @__PURE__ */ new Map(), f2 = /* @__PURE__ */ new Set(), g2 = p2.map(function(e3) {
     if (!e3.bindings || !Object.keys(e3.bindings).length) return e3;
     for (var t3 = {}, n3 = 0, o3 = Object.entries(e3.bindings); n3 < o3.length; n3++) {
@@ -48882,7 +48885,12 @@ exports.describeStoreReleaseAdvisoryStatus = function(e2) {
     var b2 = y2[h2], _2 = null === (a2 = null === (r2 = e2.presentation) || void 0 === r2 ? void 0 : r2.nodes) || void 0 === a2 ? void 0 : a2[b2.key];
     _2 && (v2[b2.key] = { x: _2.x, y: _2.y });
   }
-  return { body: { semantic: { nodes: g2, edges: u2 }, presentation: { nodes: v2 } }, slots: c2, inputs: Array.from(m2.values()), warnings: s2 };
+  return { body: { semantic: { nodes: g2, edges: u2 }, presentation: { nodes: v2 } }, slots: c2, inputs: Array.from(m2.values()).map(function(e3) {
+    var n3, o3 = null === (n3 = null == t2 ? void 0 : t2.preserveInputs) || void 0 === n3 ? void 0 : n3.find(function(t3) {
+      return t3.name === e3.name;
+    });
+    return o3 ? S(S(S({}, e3), { label: o3.label }), o3.originalReference ? { originalReference: o3.originalReference } : {}) : e3;
+  }), warnings: s2 };
 }, exports.extractSpaceToolName = rA, exports.extractTaskAssetIds = function(e2) {
   if ("string" != typeof e2 || -1 === e2.indexOf(Eu)) return [];
   var t2 = e2.match(Au);