dsh-wsr-execution 0.2.2 → 0.2.3

package/README.md

@@ -21,6 +21,6 @@ and exact MIT provenance are documented under
 `src/client/delivery-inventory/UPSTREAM.md`.
 
 The compatible `wsr-execution@^0.2.0` peer comes from the immutable GitHub
-`0.2.1` release asset recorded in `package.json`, not ambient npm resolution. Install that
+`0.2.2` release asset recorded in `package.json`, not ambient npm resolution. Install that
 asset as an explicit DSH profile root alongside this adapter; its required
 SHA-256 is `0b889b707b5fdc84d934e6c807ce101b4edaa356409253a1f48d6ffca7f53420`.

package/lib/client.js

@@ -2517,7 +2517,7 @@ var KINDS = /* @__PURE__ */ new Set([
   "terminal-result",
   "error"
 ]);
-var ACTION_STATES = /* @__PURE__ */ new Set(["running", "completed", "failed", "cancelled", "waiting", "recovering"]);
+var ACTION_STATES = /* @__PURE__ */ new Set(["running", "completed", "failed", "cancelled", "waiting", "recovering", "uncertain", "unresolved"]);
 var TERMINAL_OUTCOMES = /* @__PURE__ */ new Set(["SUCCEEDED", "FAILED", "CANCELLED"]);
 var DELIVERY_STATES = /* @__PURE__ */ new Set([
   "BOUND",
@@ -2573,7 +2573,9 @@ function hasValidTypedData(value) {
     return typeof value.data.outcome === "string" && TERMINAL_OUTCOMES.has(value.data.outcome) && outputValid;
   }
   if (value.kind === "delivery-running" || value.kind === "delivery-status") {
-    return value.data.state === void 0 || typeof value.data.state === "string" && DELIVERY_STATES.has(value.data.state);
+    const diagnostic2 = value.data.diagnostic;
+    const diagnosticValid = diagnostic2 === void 0 || diagnostic2 !== null && typeof diagnostic2 === "object" && !Array.isArray(diagnostic2) && Object.keys(diagnostic2).sort().join(",") === "causeCode,stage" && typeof diagnostic2.stage === "string" && /^[A-Z][A-Z0-9_]{0,63}$/u.test(diagnostic2.stage) && typeof diagnostic2.causeCode === "string" && /^[A-Z][A-Z0-9_]{0,127}$/u.test(diagnostic2.causeCode);
+    return diagnosticValid && (value.data.state === void 0 || typeof value.data.state === "string" && DELIVERY_STATES.has(value.data.state));
   }
   return true;
 }
@@ -2612,8 +2614,10 @@ function normalizedLifecycle(value, fallback) {
   if (["cancelled", "canceled"].includes(normalized)) return "cancelled";
   if (["waiting", "awaiting-input"].includes(normalized)) return "waiting";
   if (["start-failed"].includes(normalized)) return "failed";
-  if (["recovering", "recovery", "running-correlated", "result-unresolved", "terminal-handling"].includes(normalized)) return "recovering";
-  if (["running", "accepted", "start-uncertain", "bound"].includes(normalized)) return "running";
+  if (normalized === "start-uncertain") return "uncertain";
+  if (normalized === "result-unresolved") return "unresolved";
+  if (["recovering", "recovery", "terminal-handling"].includes(normalized)) return "recovering";
+  if (["running", "accepted", "running-correlated", "bound"].includes(normalized)) return "running";
   return fallback;
 }
 var STATE_LABELS = Object.freeze({
@@ -2622,7 +2626,9 @@ var STATE_LABELS = Object.freeze({
   failed: "Failed",
   cancelled: "Cancelled",
   waiting: "Waiting for input",
-  recovering: "Recovering"
+  recovering: "Recovering",
+  uncertain: "Start uncertain",
+  unresolved: "Result unresolved"
 });
 function model(input) {
   return deepFreeze(input);
@@ -2691,13 +2697,14 @@ function projectExecutionPresentation(event) {
   }
   const state = event.kind === "delivery-running" ? normalizedLifecycle(data.state, "running") : normalizedLifecycle(data.state, event.kind === "command-accepted" ? "running" : "running");
   const deliveryId = typeof data.deliveryId === "string" ? data.deliveryId : void 0;
+  const diagnostic2 = data.diagnostic;
   return model({
     correlation,
     layer: "progress",
     state,
     title: "Workflow delivery",
     summary: `${STATE_LABELS[state]}${deliveryId === void 0 ? "" : ` \xB7 ${deliveryId}`}`,
-    body: void 0,
+    body: diagnostic2 === void 0 ? void 0 : `${diagnostic2.stage} \xB7 ${diagnostic2.causeCode}`,
     defaultOpen: false,
     focusPolicy: "none",
     role: "status",
@@ -2714,6 +2721,8 @@ function resolveDisclosureOpen({ current, previousState, nextState, containsFocu
 var DOT_STATE = Object.freeze({
   running: "ongoing",
   recovering: "ongoing",
+  uncertain: "warning",
+  unresolved: "warning",
   completed: "done",
   waiting: "warning",
   failed: "error",
@@ -2745,6 +2754,7 @@ function createActionPresentationView({
   installActionPresentationStyle();
   return function WsrExecutionPresentationView({ node, technicalDetails }) {
     const presentation = node.data;
+    const presentationKind = typeof technicalDetails?.kind === "string" ? technicalDetails.kind : presentation.layer === "final" ? "terminal-result" : presentation.state === "waiting" ? "action-input-request" : ["action", "tool"].includes(presentation.layer) ? "action-output" : presentation.state === "failed" && presentation.title === "Workflow presentation" ? "error" : presentation.layer === "progress" && presentation.state === "running" ? "command-accepted" : "delivery-status";
     const [open, setOpen] = React2.useState(presentation.defaultOpen);
     const [copyState, setCopyState] = React2.useState("idle");
     const bodyRef = React2.useRef(null);
@@ -2798,6 +2808,8 @@ function createActionPresentationView({
         "article",
         {
           "data-wsr-presentation": "true",
+          "data-wsr-kind": presentationKind,
+          "data-wsr-surface": "chat",
           "data-wsr-layer": "final",
           "data-wsr-state": presentation.state,
           "data-wsr-correlation": presentation.correlation,
@@ -2822,7 +2834,7 @@ function createActionPresentationView({
     const expandable = (presentation.body !== void 0 || technicalDetails !== void 0) && !waiting;
     const body = presentation.body === void 0 && technicalDetails === void 0 ? void 0 : React2.createElement("div", {
       ref: bodyRef,
-      "data-wsr-presentation": "true",
+      "data-wsr-presentation-body": "true",
       "data-wsr-layer": presentation.layer,
       "data-wsr-state": presentation.state,
       "data-wsr-correlation": presentation.correlation,
@@ -2853,6 +2865,12 @@ function createActionPresentationView({
       keepContentWhenOpen: true,
       collapsedContent: React2.createElement("span", {
         role: presentation.role,
+        "data-wsr-presentation": "true",
+        "data-wsr-kind": presentationKind,
+        "data-wsr-surface": "chat",
+        "data-wsr-chat-role": "assistant",
+        "data-wsr-correlation": presentation.correlation,
+        "data-wsr-state": presentation.state,
         "aria-live": ["running", "recovering", "waiting"].includes(presentation.state) ? "polite" : void 0
       }, presentation.summary)
     }, body);
@@ -2867,14 +2885,25 @@ function reconcileDeliveryPresentation(presentation, admitted, inventoryState) {
   const deliveryId = admitted?.kind === "delivery-running" && typeof admitted.data.deliveryId === "string" ? admitted.data.deliveryId : void 0;
   const deliveries = ["ready", "reconnecting"].includes(inventoryState?.kind) && Array.isArray(inventoryState.snapshot?.deliveries) ? inventoryState.snapshot.deliveries : [];
   const matches = deliveryId === void 0 ? [] : deliveries.filter((delivery) => delivery?.deliveryId === deliveryId);
-  const terminal = matches.length === 1 && matches[0]?.lifecycle === "TERMINAL" ? TERMINAL_PRESENTATION[matches[0]?.terminal?.outcome] : void 0;
-  if (terminal === void 0) return presentation;
-  return Object.freeze({
+  const exact = matches.length === 1 ? matches[0] : void 0;
+  const terminal = exact?.lifecycle === "TERMINAL" ? TERMINAL_PRESENTATION[exact?.terminal?.outcome] : void 0;
+  if (terminal !== void 0) return Object.freeze({
     ...presentation,
     state: terminal.state,
     summary: `${terminal.label} \xB7 ${deliveryId}`,
     defaultOpen: false
   });
+  if (exact === void 0 || typeof exact.lifecycle !== "string") return presentation;
+  const lifecycle = /* @__PURE__ */ new Set(["BOUND", "START_UNCERTAIN", "RUNNING_CORRELATED", "START_FAILED", "RESULT_UNRESOLVED", "TERMINAL_HANDLING"]);
+  return lifecycle.has(exact.lifecycle) ? projectExecutionPresentation({
+    correlation: presentation.correlation,
+    kind: "delivery-status",
+    data: {
+      deliveryId,
+      state: exact.lifecycle,
+      ...admitted?.data?.diagnostic === void 0 ? {} : { diagnostic: admitted.data.diagnostic }
+    }
+  }) : presentation;
 }
 function commandPresentation(node, admitted, inventoryState) {
   if (node.outcome === null) return Object.freeze({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-wsr-execution",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "DeepSeek Harness adapter bundle for WSR Intake, Delivery resources, Session state, Actions, and final results.",
   "type": "module",
   "main": "./src/index.js",
@@ -39,10 +39,10 @@
     "displayName": "WSR",
     "role": "execution-adapter",
     "foundationOnly": false,
-    "ownerRevision": "ffe7cc27f89f6555265f438a51f490355c68e7da",
+    "ownerRevision": "b4b3b487af7f163c5934aa758d86b183d64115ec",
     "ownerAsset": {
-      "url": "https://github.com/firestige/wsr-execution/releases/download/0.2.1/wsr-execution-0.2.1.tgz",
-      "sha256": "9375714297ea0af221ad9634f08c1b205d985649ae51db2964d46e6a9e4accf4"
+      "url": "https://github.com/firestige/wsr-execution/releases/download/0.2.2/wsr-execution-0.2.2.tgz",
+      "sha256": "d07eb0aaa4e0498e9e3f5f9bbf3ae4c6a1a9a7ea6c648d15cdfdcccbf53bb41e"
     }
   },
   "dependencies": {

package/src/action-presentation/model.js

@@ -15,7 +15,7 @@ const KINDS = new Set([
   "terminal-result",
   "error",
 ]);
-const ACTION_STATES = new Set(["running", "completed", "failed", "cancelled", "waiting", "recovering"]);
+const ACTION_STATES = new Set(["running", "completed", "failed", "cancelled", "waiting", "recovering", "uncertain", "unresolved"]);
 const TERMINAL_OUTCOMES = new Set(["SUCCEEDED", "FAILED", "CANCELLED"]);
 const DELIVERY_STATES = new Set([
   "BOUND", "START_UNCERTAIN", "RUNNING_CORRELATED", "START_FAILED", "RESULT_UNRESOLVED", "TERMINAL_HANDLING",
@@ -70,8 +70,13 @@ function hasValidTypedData(value) {
     return typeof value.data.outcome === "string" && TERMINAL_OUTCOMES.has(value.data.outcome) && outputValid;
   }
   if (value.kind === "delivery-running" || value.kind === "delivery-status") {
-    return value.data.state === undefined
-      || (typeof value.data.state === "string" && DELIVERY_STATES.has(value.data.state));
+    const diagnostic = value.data.diagnostic;
+    const diagnosticValid = diagnostic === undefined || (diagnostic !== null && typeof diagnostic === "object" && !Array.isArray(diagnostic)
+      && Object.keys(diagnostic).sort().join(",") === "causeCode,stage"
+      && typeof diagnostic.stage === "string" && /^[A-Z][A-Z0-9_]{0,63}$/u.test(diagnostic.stage)
+      && typeof diagnostic.causeCode === "string" && /^[A-Z][A-Z0-9_]{0,127}$/u.test(diagnostic.causeCode));
+    return diagnosticValid && (value.data.state === undefined
+      || (typeof value.data.state === "string" && DELIVERY_STATES.has(value.data.state)));
   }
   return true;
 }
@@ -120,8 +125,10 @@ function normalizedLifecycle(value, fallback) {
   if (["cancelled", "canceled"].includes(normalized)) return "cancelled";
   if (["waiting", "awaiting-input"].includes(normalized)) return "waiting";
   if (["start-failed"].includes(normalized)) return "failed";
-  if (["recovering", "recovery", "running-correlated", "result-unresolved", "terminal-handling"].includes(normalized)) return "recovering";
-  if (["running", "accepted", "start-uncertain", "bound"].includes(normalized)) return "running";
+  if (normalized === "start-uncertain") return "uncertain";
+  if (normalized === "result-unresolved") return "unresolved";
+  if (["recovering", "recovery", "terminal-handling"].includes(normalized)) return "recovering";
+  if (["running", "accepted", "running-correlated", "bound"].includes(normalized)) return "running";
   return fallback;
 }
 
@@ -132,6 +139,8 @@ const STATE_LABELS = Object.freeze({
   cancelled: "Cancelled",
   waiting: "Waiting for input",
   recovering: "Recovering",
+  uncertain: "Start uncertain",
+  unresolved: "Result unresolved",
 });
 
 function model(input) {
@@ -182,10 +191,12 @@ export function projectExecutionPresentation(event) {
     ? normalizedLifecycle(data.state, "running")
     : normalizedLifecycle(data.state, event.kind === "command-accepted" ? "running" : "running");
   const deliveryId = typeof data.deliveryId === "string" ? data.deliveryId : undefined;
+  const diagnostic = data.diagnostic;
   return model({
     correlation, layer: "progress", state, title: "Workflow delivery",
     summary: `${STATE_LABELS[state]}${deliveryId === undefined ? "" : ` · ${deliveryId}`}`,
-    body: undefined, defaultOpen: false, focusPolicy: "none", role: "status", compatibility: "current",
+    body: diagnostic === undefined ? undefined : `${diagnostic.stage} · ${diagnostic.causeCode}`,
+    defaultOpen: false, focusPolicy: "none", role: "status", compatibility: "current",
   });
 }
 

package/src/action-presentation/view.js

@@ -3,6 +3,8 @@ import { parseExecutionPresentation, projectExecutionPresentation, resolveDisclo
 const DOT_STATE = Object.freeze({
   running: "ongoing",
   recovering: "ongoing",
+  uncertain: "warning",
+  unresolved: "warning",
   completed: "done",
   waiting: "warning",
   failed: "error",
@@ -42,6 +44,14 @@ export function createActionPresentationView({
 
   return function WsrExecutionPresentationView({ node, technicalDetails }) {
     const presentation = node.data;
+    const presentationKind = typeof technicalDetails?.kind === "string"
+      ? technicalDetails.kind
+      : presentation.layer === "final" ? "terminal-result"
+        : presentation.state === "waiting" ? "action-input-request"
+          : ["action", "tool"].includes(presentation.layer) ? "action-output"
+            : presentation.state === "failed" && presentation.title === "Workflow presentation" ? "error"
+              : presentation.layer === "progress" && presentation.state === "running" ? "command-accepted"
+                : "delivery-status";
     const [open, setOpen] = React.useState(presentation.defaultOpen);
     const [copyState, setCopyState] = React.useState("idle");
     const bodyRef = React.useRef(null);
@@ -96,6 +106,8 @@ export function createActionPresentationView({
       };
       return React.createElement("article", {
         "data-wsr-presentation": "true",
+        "data-wsr-kind": presentationKind,
+        "data-wsr-surface": "chat",
         "data-wsr-layer": "final",
         "data-wsr-state": presentation.state,
         "data-wsr-correlation": presentation.correlation,
@@ -120,7 +132,7 @@ export function createActionPresentationView({
     const expandable = (presentation.body !== undefined || technicalDetails !== undefined) && !waiting;
     const body = presentation.body === undefined && technicalDetails === undefined ? undefined : React.createElement("div", {
       ref: bodyRef,
-      "data-wsr-presentation": "true",
+      "data-wsr-presentation-body": "true",
       "data-wsr-layer": presentation.layer,
       "data-wsr-state": presentation.state,
       "data-wsr-correlation": presentation.correlation,
@@ -151,7 +163,13 @@ export function createActionPresentationView({
       keepContentWhenOpen: true,
       collapsedContent: React.createElement("span", {
         role: presentation.role,
-        "aria-live": ["running", "recovering", "waiting"].includes(presentation.state) ? "polite" : undefined,
+        "data-wsr-presentation": "true",
+        "data-wsr-kind": presentationKind,
+      "data-wsr-surface": "chat",
+      "data-wsr-chat-role": "assistant",
+      "data-wsr-correlation": presentation.correlation,
+      "data-wsr-state": presentation.state,
+      "aria-live": ["running", "recovering", "waiting"].includes(presentation.state) ? "polite" : undefined,
       }, presentation.summary),
     }, body);
   };
@@ -172,16 +190,29 @@ function reconcileDeliveryPresentation(presentation, admitted, inventoryState) {
     ? inventoryState.snapshot.deliveries
     : [];
   const matches = deliveryId === undefined ? [] : deliveries.filter((delivery) => delivery?.deliveryId === deliveryId);
-  const terminal = matches.length === 1 && matches[0]?.lifecycle === "TERMINAL"
-    ? TERMINAL_PRESENTATION[matches[0]?.terminal?.outcome]
+  const exact = matches.length === 1 ? matches[0] : undefined;
+  const terminal = exact?.lifecycle === "TERMINAL"
+    ? TERMINAL_PRESENTATION[exact?.terminal?.outcome]
     : undefined;
-  if (terminal === undefined) return presentation;
-  return Object.freeze({
-    ...presentation,
-    state: terminal.state,
-    summary: `${terminal.label} · ${deliveryId}`,
-    defaultOpen: false,
-  });
+  if (terminal !== undefined) return Object.freeze({
+      ...presentation,
+      state: terminal.state,
+      summary: `${terminal.label} · ${deliveryId}`,
+      defaultOpen: false,
+    });
+  if (exact === undefined || typeof exact.lifecycle !== "string") return presentation;
+  const lifecycle = new Set(["BOUND", "START_UNCERTAIN", "RUNNING_CORRELATED", "START_FAILED", "RESULT_UNRESOLVED", "TERMINAL_HANDLING"]);
+  return lifecycle.has(exact.lifecycle)
+    ? projectExecutionPresentation({
+      correlation: presentation.correlation,
+      kind: "delivery-status",
+      data: {
+        deliveryId,
+        state: exact.lifecycle,
+        ...(admitted?.data?.diagnostic === undefined ? {} : { diagnostic: admitted.data.diagnostic }),
+      },
+    })
+    : presentation;
 }
 
 function commandPresentation(node, admitted, inventoryState) {

package/src/intake/command.js

@@ -1,5 +1,7 @@
+const USAGE = "Usage: /wsr list | create <selector> | recover [delivery-id] | status [delivery-id] | action finish. Usage: /wsr abandon [delivery-id]";
+
 function invalid() {
-  throw new TypeError("WSR_COMMAND_INVALID");
+  throw Object.assign(new TypeError(`WSR_COMMAND_INVALID. ${USAGE}`), { code: "WSR_COMMAND_INVALID" });
 }
 
 function split(value) {
@@ -30,6 +32,10 @@ export function parseWsrCommand(value) {
     return Object.freeze({ operation: "status", deliveryId });
   }
   if (line === "action finish") return Object.freeze({ operation: "action-finish", ...(remainder === undefined ? {} : { remainder }) });
+  if (line === "abandon") {
+    if (remainder !== undefined) invalid();
+    return Object.freeze({ operation: "abandon" });
+  }
   if (line.startsWith("abandon ")) {
     const deliveryId = line.slice(8);
     if (deliveryId.length === 0 || deliveryId.includes(" ") || remainder !== undefined) invalid();

package/src/intake/plugin.js

@@ -451,10 +451,12 @@ export async function createPluginRuntime(config, options = {}) {
       if (existing === undefined) return error("DELIVERY_UNKNOWN");
       return service.invoke(Object.freeze({ operation: "action-finish", ...(operation.remainder === undefined && attachments.length === 0 ? {} : { turn: Object.freeze({ text: operation.remainder ?? "", attachments }) }), correlation: existing.correlation }));
     }
-    const result = await service.invoke(Object.freeze({ operation: "abandon", deliveryId: operation.deliveryId, correlation }));
+    const deliveryId = operation.deliveryId ?? existing?.deliveryId;
+    if (deliveryId === undefined) return error("WSR_COMMAND_INVALID");
+    const result = await service.invoke(Object.freeze({ operation: "abandon", deliveryId, correlation }));
     if (result.kind === "TERMINAL") {
-      const detached = await bindings.byDelivery(operation.deliveryId);
-      if (detached !== undefined) await archiveTerminal(detached.sessionKey, detached.correlation, operation.deliveryId);
+      const detached = await bindings.byDelivery(deliveryId);
+      if (detached !== undefined) await archiveTerminal(detached.sessionKey, detached.correlation, deliveryId);
       if (detached !== undefined) sessionByCorrelation.delete(detached.correlation);
     }
     return result;
@@ -514,7 +516,8 @@ export function mapIntakeToolOperation(args) {
     || Object.keys(args).some((key) => !["operation", "selector", "deliveryId"].includes(key))
     || !operationNames.includes(args.operation)
     || (args.operation === "create") !== (typeof args.selector === "string" && args.selector.length > 0)
-    || (args.operation === "abandon" && (typeof args.deliveryId !== "string" || args.deliveryId.length === 0))
+    || (args.operation === "abandon" && args.deliveryId !== undefined
+      && (typeof args.deliveryId !== "string" || args.deliveryId.length === 0))
     || (!["recover", "status", "abandon"].includes(args.operation) && args.deliveryId !== undefined)) {
     throw new TypeError("INTAKE_OPERATION_INVALID");
   }
@@ -536,7 +539,7 @@ export async function apply(ctx, config) {
   const command = ctx.commands.register({
     name: "wsr",
     description: "Create, list, recover, inspect, finish, or abandon a Workflow Delivery",
-    input: { hint: "list | create <selector> | recover [delivery-id] | status [delivery-id] | action finish | abandon <delivery-id>", images: true },
+    input: { hint: "list | create <selector> | recover [delivery-id] | status [delivery-id] | action finish | abandon [delivery-id]", images: true },
     recordInput: true,
     async handler(invocation) {
       return run((async () => {
@@ -571,7 +574,8 @@ export async function apply(ctx, config) {
         } catch (cause) {
           const { createIntakePresentation, serializeIntakePresentation } = await import("wsr-execution");
           const code = typeof cause?.code === "string" ? cause.code : "DSH_INTAKE_FAILED";
-          const presentation = createIntakePresentation(`presentation-${randomUUID()}`, "error", { code, message: code });
+          const message = code === "WSR_COMMAND_INVALID" && typeof cause?.message === "string" ? cause.message : code;
+          const presentation = createIntakePresentation(`presentation-${randomUUID()}`, "error", { code, message });
           presentToDshSession(invocation.agent, presentation);
           return { kind: "error", text: serializeIntakePresentation(presentation, 4096) };
         }