@simplr-ai/connect 0.7.5 → 0.7.6

package/dist/index.js

@@ -115,6 +115,84 @@ function mcpConfigurationPaths(homeDirectory, workingDirectory, organizationId)
   ];
 }
 
+// src/work-order-support.ts
+function workOrderClassification(payload) {
+  return {
+    ...typeof payload.work_order_kind === "string" ? { work_order_kind: payload.work_order_kind } : {},
+    ...typeof payload.source_type === "string" ? { source_type: payload.source_type } : {},
+    ...typeof payload.execution_mode === "string" ? { execution_mode: payload.execution_mode } : {}
+  };
+}
+function awaitsFeaturePlanApproval(classification) {
+  return classification.work_order_kind === "feature" && classification.source_type === "feedback" && classification.execution_mode === "plan";
+}
+function workOrderPayload(classification) {
+  return {
+    ...classification.work_order_kind ? { work_order_kind: classification.work_order_kind } : {},
+    ...classification.source_type ? { source_type: classification.source_type } : {},
+    ...classification.execution_mode ? { execution_mode: classification.execution_mode } : {}
+  };
+}
+async function postWithApiKey(url, body, apiKey) {
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "X-API-Key": apiKey
+    },
+    body: JSON.stringify(body),
+    signal: AbortSignal.timeout(1e4)
+  });
+  const payload = await response.json().catch(() => ({}));
+  if (!response.ok || !payload.content)
+    throw new Error(
+      payload.message || `Simplr request failed (${response.status})`
+    );
+  return payload.content;
+}
+function reservedSimplrConnectLane(organizationNamespace2) {
+  return `simplr-connect-reserved:${organizationNamespace2}`;
+}
+function isRunningTaskOwnedBy(task, expectedAssignee) {
+  return (task.task?.status || task.status) === "running" && (task.task?.assignee || task.assignee) === expectedAssignee;
+}
+var terminalCommentMarker = (action) => `[simplr-connect-terminal:${action}]`;
+function taskStatus(task) {
+  return task.task?.status || task.status;
+}
+function taskBlockKind(task) {
+  const blockedEvent = [...task.events || []].reverse().find((event) => event.kind === "blocked");
+  return task.task?.block_kind || task.block_kind || blockedEvent?.payload?.kind;
+}
+function hasTerminalComment(task, action) {
+  const marker = terminalCommentMarker(action);
+  return (task.comments || []).some((comment) => comment.body?.includes(marker));
+}
+function reconcileTerminalBlock(action, detail, operations) {
+  const kind = action === "needs_input" ? "needs_input" : "transient";
+  const matches = (task) => taskStatus(task) === "blocked" && taskBlockKind(task) === kind && hasTerminalComment(task, action);
+  let current = operations.read();
+  if (!current)
+    throw new Error(`Hermes work-board ${action} preflight failed`);
+  if (matches(current)) return true;
+  if (!hasTerminalComment(current, action)) {
+    const body = `${detail}
+
+${terminalCommentMarker(action)}`;
+    const commented = operations.comment(body);
+    current = operations.read();
+    if (!current || !commented && !hasTerminalComment(current, action))
+      throw new Error(`Hermes work-board ${action} comment reconciliation failed`);
+  }
+  if (matches(current)) return true;
+  const blocked = operations.block(kind);
+  current = operations.read();
+  if (current && matches(current)) return true;
+  if (!blocked)
+    throw new Error(`Hermes work-board ${action} reconciliation failed`);
+  throw new Error(`Hermes work-board ${action} verification failed`);
+}
+
 // src/index.ts
 var AmbiguousHermesRunError = class extends Error {
 };
@@ -122,7 +200,7 @@ var KanbanReconciliationError = class extends Error {
 };
 var DeferredUpdateError = class extends Error {
 };
-var APP_VERSION = "0.7.5";
+var APP_VERSION = "0.7.6";
 var STANDALONE_EXECUTABLE = process.env.SIMPLR_CONNECT_STANDALONE === "true";
 var MANIFEST_PUBLIC_KEY = process.env.SIMPLR_CONNECT_MANIFEST_PUBLIC_KEY || "";
 var HERMES_INSTALL_COMMIT = "542e146b055f0d43767ac43cdb9e78054b240263";
@@ -1583,11 +1661,47 @@ function isSimplrWorkOrder(command) {
     String(command.payload.execution_mode)
   );
 }
+async function claimSimplrFeedbackInCloud(state, command) {
+  if (String(command.payload.source_type) !== "feedback") return;
+  const sourceId = String(command.payload.source_id || "");
+  if (!sourceId) throw new Error("Simplr feedback source is missing");
+  const agentToken = await ensureAgentCredential(state);
+  await postWithApiKey(
+    `${state.api_url}/v1/feedback/agent/items/${encodeURIComponent(sourceId)}/claim`,
+    {},
+    agentToken
+  );
+}
+function readSimplrKanbanTask(executable, state, taskId) {
+  for (let attempt = 0; attempt < 3; attempt += 1) {
+    const shown = commandResult(
+      executable,
+      [
+        ...hermesProfileArgs(state),
+        "kanban",
+        "--board",
+        `simplr-${organizationNamespace(state.organization_id)}`,
+        "show",
+        taskId,
+        "--json"
+      ],
+      1e4
+    );
+    if (shown.ok) return JSON.parse(shown.output);
+  }
+  return null;
+}
+function simplrKanbanTaskStatus(task) {
+  return task.task?.status || task.status;
+}
 function ensureSimplrKanbanTask(state, command, prompt) {
   if (!isSimplrWorkOrder(command)) return void 0;
   const executable = detectHermesExecutable();
   if (!executable) throw new Error("Hermes executable is unavailable");
   const boardSlug = `simplr-${organizationNamespace(state.organization_id)}`;
+  const reservedAssignee = reservedSimplrConnectLane(
+    organizationNamespace(state.organization_id)
+  );
   const boards = commandResult(
     executable,
     [...hermesProfileArgs(state), "kanban", "boards", "list", "--json"],
@@ -1664,10 +1778,12 @@ ${prompt}`;
       `simplr-connect:${state.organization_id}:${command.id}`,
       "--created-by",
       "Simplr Connect",
+      "--assignee",
+      reservedAssignee,
       "--skill",
       "simplr-remote-operations",
       "--initial-status",
-      "blocked",
+      "running",
       "--json"
     ],
     15e3
@@ -1676,12 +1792,33 @@ ${prompt}`;
     throw new Error("Hermes could not persist the Simplr work order");
   const task = JSON.parse(createdTask.output);
   if (!task.id) throw new Error("Hermes did not return a work-order task id");
-  updateSimplrKanbanTask(
-    state,
-    task.id,
-    "comment",
-    "Simplr Connect started the governed Hermes run. Use Simplr for approvals and deployment decisions; this card preserves the durable handoff."
-  );
+  let current = readSimplrKanbanTask(executable, state, task.id);
+  if (!current) throw new Error("Hermes could not verify the Simplr work-order task");
+  if (simplrKanbanTaskStatus(current) === "ready") {
+    const claimed = commandResult(
+      executable,
+      [
+        ...hermesProfileArgs(state),
+        "kanban",
+        "--board",
+        boardSlug,
+        "claim",
+        task.id,
+        "--ttl",
+        "3600"
+      ],
+      1e4
+    );
+    current = readSimplrKanbanTask(executable, state, task.id);
+    if (!claimed.ok && simplrKanbanTaskStatus(current || {}) !== "running") {
+      throw new Error("Hermes could not claim the Simplr work-order task");
+    }
+  }
+  if (!current || !isRunningTaskOwnedBy(current, reservedAssignee)) {
+    throw new Error(
+      "Hermes Simplr work-order task is not running in its reserved ownership lane"
+    );
+  }
   return task.id;
 }
 function updateSimplrKanbanTask(state, taskId, action, detail) {
@@ -1710,7 +1847,47 @@ function updateSimplrKanbanTask(state, taskId, action, detail) {
       1e4
     ).ok;
   }
-  const args = action === "complete" ? [
+  if (action === "failed" || action === "needs_input") {
+    try {
+      return reconcileTerminalBlock(action, detail.slice(0, 2e3), {
+        read: () => readSimplrKanbanTask(executable, state, taskId),
+        comment: (body) => commandResult(
+          executable,
+          [
+            ...hermesProfileArgs(state),
+            "kanban",
+            "--board",
+            `simplr-${organizationNamespace(state.organization_id)}`,
+            "comment",
+            "--author",
+            "Simplr Connect",
+            taskId,
+            body
+          ],
+          1e4
+        ).ok,
+        block: (kind) => commandResult(
+          executable,
+          [
+            ...hermesProfileArgs(state),
+            "kanban",
+            "--board",
+            `simplr-${organizationNamespace(state.organization_id)}`,
+            "block",
+            "--kind",
+            kind,
+            taskId
+          ],
+          1e4
+        ).ok
+      });
+    } catch (error) {
+      throw new KanbanReconciliationError(
+        error instanceof Error ? error.message : `Hermes work-board ${action} reconciliation failed`
+      );
+    }
+  }
+  const args = [
     ...hermesProfileArgs(state),
     "kanban",
     "--board",
@@ -1724,39 +1901,21 @@ function updateSimplrKanbanTask(state, taskId, action, detail) {
       source: "simplr-connect",
       rules_version: "simplr-work-order-v1"
     })
-  ] : [
-    ...hermesProfileArgs(state),
-    "kanban",
-    "--board",
-    `simplr-${organizationNamespace(state.organization_id)}`,
-    "block",
-    "--kind",
-    "transient",
-    taskId,
-    detail.slice(0, 2e3)
   ];
-  for (let attempt = 0; attempt < 3; attempt += 1) {
-    if (commandResult(executable, args, 1e4).ok) return true;
-    const shown = commandResult(
-      executable,
-      [
-        ...hermesProfileArgs(state),
-        "kanban",
-        "--board",
-        `simplr-${organizationNamespace(state.organization_id)}`,
-        "show",
-        taskId,
-        "--json"
-      ],
-      1e4
+  const matchesAction = (current) => {
+    const currentStatus = simplrKanbanTaskStatus(current);
+    return action === "complete" && currentStatus === "done";
+  };
+  const initial = readSimplrKanbanTask(executable, state, taskId);
+  if (!initial) {
+    throw new KanbanReconciliationError(
+      `Hermes work-board ${action} preflight failed`
     );
-    if (shown.ok) {
-      const current = JSON.parse(shown.output);
-      const currentStatus = current.task?.status || current.status;
-      if (action === "complete" && currentStatus === "done" || action === "failed" && currentStatus === "blocked")
-        return true;
-    }
   }
+  if (matchesAction(initial)) return true;
+  if (commandResult(executable, args, 1e4).ok) return true;
+  const reconciled = readSimplrKanbanTask(executable, state, taskId);
+  if (reconciled && matchesAction(reconciled)) return true;
   throw new KanbanReconciliationError(
     `Hermes work-board ${action} reconciliation failed`
   );
@@ -2167,13 +2326,24 @@ async function monitorHermesRun(state, command, runId, startedAt) {
           command_id: command.id,
           type: command.type,
           label: command.reason,
+          ...workOrderClassification(command.payload),
           run_id: runId,
           status: "completed",
           result: output,
           started_at: startedAt,
           updated_at: (/* @__PURE__ */ new Date()).toISOString()
         });
-        updateSimplrKanbanTask(state, taskId, "complete", output);
+        const awaitingPlanApproval = awaitsFeaturePlanApproval(
+          workOrderClassification(command.payload)
+        );
+        updateSimplrKanbanTask(
+          state,
+          taskId,
+          awaitingPlanApproval ? "needs_input" : "complete",
+          awaitingPlanApproval ? `Feature plan ready for comment and approval. Review the plan below, add guidance, then explicitly approve a new implementation work order.
+
+${output}` : output
+        );
         return output;
       }
       if (status.status === "cancelled")
@@ -2186,6 +2356,7 @@ async function monitorHermesRun(state, command, runId, startedAt) {
           command_id: command.id,
           type: command.type,
           label: command.reason,
+          ...workOrderClassification(command.payload),
           run_id: runId,
           status: run.status,
           started_at: startedAt,
@@ -2197,6 +2368,7 @@ async function monitorHermesRun(state, command, runId, startedAt) {
             command_id: command.id,
             type: command.type,
             label: command.reason,
+            ...workOrderClassification(command.payload),
             run_id: runId,
             status: run.status,
             approval_command: approval.approval_command,
@@ -2254,11 +2426,14 @@ async function runHermesCommand(state, command) {
   const journal = await loadCommandJournal();
   const existing = journal[command.id];
   if (existing?.status === "completed") {
+    const awaitingPlanApproval = awaitsFeaturePlanApproval(existing);
     updateSimplrKanbanTask(
       state,
       existing.kanban_task_id,
-      "complete",
-      existing.result || "Hermes completed the task"
+      awaitingPlanApproval ? "needs_input" : "complete",
+      awaitingPlanApproval ? `Feature plan ready for comment and approval. Review the plan below, add guidance, then explicitly approve a new implementation work order.
+
+${existing.result || "Hermes completed the plan"}` : existing.result || "Hermes completed the task"
     );
     return "Hermes completed this task before Simplr reconnected";
   }
@@ -2273,6 +2448,21 @@ async function runHermesCommand(state, command) {
   if (!runId) {
     const prompt = typeof command.payload.prompt === "string" ? command.payload.prompt : "";
     if (!prompt) throw new Error("Hermes task prompt is missing");
+    if (existing?.status !== "preparing") {
+      await updateCommandJournal({
+        command_id: command.id,
+        organization_id: state.organization_id,
+        organization_name: state.organization_name,
+        workstation_id: state.workstation_id,
+        type: command.type,
+        label: command.reason,
+        ...workOrderClassification(command.payload),
+        status: "preparing",
+        started_at: startedAt,
+        updated_at: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    }
+    await claimSimplrFeedbackInCloud(state, command);
     const kanbanTaskId = ensureSimplrKanbanTask(state, command, prompt);
     await updateCommandJournal({
       command_id: command.id,
@@ -2281,6 +2471,7 @@ async function runHermesCommand(state, command) {
       workstation_id: state.workstation_id,
       type: command.type,
       label: command.reason,
+      ...workOrderClassification(command.payload),
       status: "creating",
       kanban_task_id: kanbanTaskId,
       started_at: startedAt,
@@ -2303,6 +2494,7 @@ async function runHermesCommand(state, command) {
       command_id: command.id,
       type: command.type,
       label: command.reason,
+      ...workOrderClassification(command.payload),
       run_id: runId,
       status: "running",
       started_at: startedAt,
@@ -2612,6 +2804,7 @@ async function applyCommand(state, command, inventoryAlreadySynced) {
         command_id: command.id,
         type: command.type,
         label: command.reason,
+        ...workOrderClassification(command.payload),
         run_id: existing?.run_id,
         status: "failed",
         started_at: existing?.started_at || (/* @__PURE__ */ new Date()).toISOString(),
@@ -2667,7 +2860,7 @@ async function resumeHermesRuns(state) {
         workstation_id: connection.workstation_id,
         type: "run_hermes",
         reason: entry.label,
-        payload: {}
+        payload: workOrderPayload(entry)
       },
       false
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplr-ai/connect",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "Simplr Connect workstation enrollment and AI tool inventory companion",
   "type": "module",
   "main": "dist/index.js",