@amaster.ai/employee-runtime-connector 0.1.0-beta.23 → 0.1.0-beta.25

package/dist/amaster-runtime-daemon.mjs

@@ -3218,6 +3218,46 @@ function approvedMcpInvocationSucceeded(results, invocationId) {
     return readString(result2.invocationId) === approvedInvocationId && readString(result2.status) === "succeeded" && !["rejected", "blocked"].includes(readString(result2.providerStatus) ?? "");
   }));
 }
+function governedMcpToolResult(structuredContent) {
+  const status = readString(structuredContent.status);
+  if (!status) return null;
+  const invocationId = readString(structuredContent.invocationId);
+  const providerContent = asRecord(structuredContent.content);
+  const providerStatus = readString(providerContent.status);
+  const effectResult = asRecord(asRecord(providerContent.result).effectResult);
+  const intentId = readString(effectResult.artifactIntentId);
+  const manifestId = readString(effectResult.manifestId);
+  const sourceRelativePath = readString(effectResult.sourceRelativePath);
+  const sha256 = readString(effectResult.sha256);
+  const byteSize = readNumber(effectResult.byteSize, 0);
+  const artifactIntent = providerStatus === "pending_reconcile" && intentId && manifestId && sourceRelativePath && /^[a-f0-9]{64}$/.test(sha256 ?? "") && Number.isSafeInteger(byteSize) && byteSize > 0 ? { intentId, manifestId, sourceRelativePath, sha256, byteSize } : null;
+  return {
+    ...invocationId ? { invocationId } : {},
+    status,
+    ...providerStatus ? { providerStatus } : {},
+    ...artifactIntent ? { artifactIntent } : {}
+  };
+}
+function codexMcpToolResults(event) {
+  if (event?.type !== "item.completed") return [];
+  const item = asRecord(event.item);
+  if (item.type !== "mcp_tool_call") return [];
+  const result2 = asRecord(item.result);
+  let structuredContent = asRecord(result2.structuredContent);
+  if (Object.keys(structuredContent).length === 0 && Array.isArray(result2.content)) {
+    for (const part of result2.content) {
+      const text = readString(asRecord(part).text);
+      if (!text) continue;
+      try {
+        structuredContent = asRecord(JSON.parse(text));
+      } catch {
+      }
+      if (Object.keys(structuredContent).length > 0) break;
+    }
+  }
+  const parsed = governedMcpToolResult(structuredContent);
+  return parsed ? [parsed] : [];
+}
 function parseCodexJsonl(stdout) {
   let sessionId = null;
   let summary = "";
@@ -3237,26 +3277,7 @@ function parseCodexJsonl(stdout) {
       if (item.type === "agent_message") {
         summary = readString(item.text) ?? summary;
       }
-      if (item.type === "mcp_tool_call") {
-        const result2 = asRecord(item.result);
-        let structuredContent = asRecord(result2.structuredContent);
-        if (Object.keys(structuredContent).length === 0 && Array.isArray(result2.content)) {
-          for (const part of result2.content) {
-            const text = readString(asRecord(part).text);
-            if (!text) continue;
-            try {
-              structuredContent = asRecord(JSON.parse(text));
-            } catch {
-            }
-            if (Object.keys(structuredContent).length > 0) break;
-          }
-        }
-        const status = readString(structuredContent.status);
-        if (status) {
-          const invocationId = readString(structuredContent.invocationId);
-          mcpToolResults.push({ ...invocationId ? { invocationId } : {}, status });
-        }
-      }
+      mcpToolResults.push(...codexMcpToolResults(event));
       continue;
     }
     if (event.type === "turn.completed") {
@@ -3612,24 +3633,8 @@ function piMcpToolResults(event) {
     const message = asRecord(rawMessage);
     if (message.role !== "toolResult") continue;
     const structuredContent = asRecord(asRecord(asRecord(message.details).mcpResult).structuredContent);
-    const status = readString(structuredContent.status);
-    if (!status) continue;
-    const invocationId = readString(structuredContent.invocationId);
-    const providerContent = asRecord(structuredContent.content);
-    const providerStatus = readString(providerContent.status);
-    const effectResult = asRecord(asRecord(providerContent.result).effectResult);
-    const intentId = readString(effectResult.artifactIntentId);
-    const manifestId = readString(effectResult.manifestId);
-    const sourceRelativePath = readString(effectResult.sourceRelativePath);
-    const sha256 = readString(effectResult.sha256);
-    const byteSize = readNumber(effectResult.byteSize, 0);
-    const artifactIntent = providerContent.status === "pending_reconcile" && intentId && manifestId && sourceRelativePath && /^[a-f0-9]{64}$/.test(sha256 ?? "") && Number.isSafeInteger(byteSize) && byteSize > 0 ? { intentId, manifestId, sourceRelativePath, sha256, byteSize } : null;
-    results.push({
-      ...invocationId ? { invocationId } : {},
-      status,
-      ...providerStatus ? { providerStatus } : {},
-      ...artifactIntent ? { artifactIntent } : {}
-    });
+    const parsed = governedMcpToolResult(structuredContent);
+    if (parsed) results.push(parsed);
   }
   return results;
 }
@@ -3917,6 +3922,38 @@ function prepareRuntimeArtifactUploads(cwd, mcpToolResults) {
   return [...uploads.values()];
 }
 
+// src/amaster-runtime-daemon/runtime-artifact-ingest-queue.mjs
+function createRuntimeArtifactIngestQueue({ ingest, onError }) {
+  const handledIntentIds = /* @__PURE__ */ new Set();
+  const artifacts = [];
+  let error = null;
+  let queue = Promise.resolve();
+  return {
+    enqueue(results) {
+      if (error) return;
+      const pending = results.filter((result2) => {
+        const intentId = readString(asRecord(result2).artifactIntent?.intentId);
+        if (!intentId || handledIntentIds.has(intentId)) return false;
+        handledIntentIds.add(intentId);
+        return true;
+      });
+      if (pending.length === 0) return;
+      queue = queue.then(async () => artifacts.push(...await ingest(pending))).catch((caught) => {
+        error ??= caught;
+        onError?.(caught);
+      });
+    },
+    hasHandled(intentId) {
+      return handledIntentIds.has(intentId);
+    },
+    async flush() {
+      await queue;
+      if (error) throw error;
+      return [...artifacts];
+    }
+  };
+}
+
 // src/amaster-runtime-daemon/workspace-guard.mjs
 import { createHash as createHash4 } from "node:crypto";
 import { existsSync as existsSync5, mkdirSync as mkdirSync4, realpathSync as realpathSync2, statSync as statSync3 } from "node:fs";
@@ -4663,7 +4700,7 @@ function readWorkspaceStatus(cwd, opts = {}) {
 }
 
 // src/amaster-runtime-daemon.mjs
-var CONNECTOR_VERSION = "0.1.0-beta.23";
+var CONNECTOR_VERSION = "0.1.0-beta.25";
 var CONNECTOR_CONTRACT_VERSION = "2026-06-04.v1";
 var MAX_CHECKPOINT_BYTES = 20 * 1024 * 1024;
 var CHECKPOINT_TTL_MS = 24 * 60 * 60 * 1e3;
@@ -6160,7 +6197,7 @@ function redactProtectedText(value, protectedValues = []) {
   }
   return text;
 }
-function createLiveOutputLogger(config, command, executorKind, protectedValues = []) {
+function createLiveOutputLogger(config, command, executorKind, protectedValues = [], onMcpToolResults = null) {
   const buffers = { stdout: "", stderr: "" };
   const displayCounts = { stdout: 0, stderr: 0, system: 0 };
   const sourceCounts = { stdout: 0, stderr: 0 };
@@ -6258,7 +6295,11 @@ function createLiveOutputLogger(config, command, executorKind, protectedValues =
     if (executorKind === "pi" && readString(asRecord(event).type) === "session") {
       executorSessionId = readString(asRecord(event).sessionId ?? asRecord(event).id) ?? executorSessionId;
     }
-    if (executorKind === "pi" && event) liveMcpToolResults.push(...piMcpToolResults(event));
+    if (["codex", "pi"].includes(executorKind) && event) {
+      const results = executorKind === "codex" ? codexMcpToolResults(event) : piMcpToolResults(event);
+      liveMcpToolResults.push(...results);
+      if (results.length > 0) onMcpToolResults?.(results);
+    }
     let entry = null;
     if (event && shouldPreserveExecutorJsonlForTranscript(executorKind, event)) {
       entry = {
@@ -6609,8 +6650,8 @@ function runOrphanReaper(config, options = {}) {
     return finishSummary();
   }
   const refs = activeRuntimeExecutionRefs();
-  const processRows = allProcessRows();
-  const processCwdsByPid = allProcessCwdsByPid();
+  let processRows = null;
+  let processCwdsByPid = null;
   for (const workdir of walkManagedWorkdirs(config.runtimeWorkspacesRoot)) {
     const manifest = readWorkspaceManifest(workspaceManifestPath(workdir));
     if (!manifest || manifest.managed !== true) continue;
@@ -6619,6 +6660,8 @@ function runOrphanReaper(config, options = {}) {
       summary.protectedWorkdirCount += 1;
       continue;
     }
+    processRows ??= allProcessRows();
+    processCwdsByPid ??= allProcessCwdsByPid();
     const residents = listWorkspaceResidentProcesses(workdir, null, { processRows, processCwdsByPid });
     if (residents.length === 0) continue;
     summary.orphanWorkdirCount += 1;
@@ -7791,7 +7834,18 @@ async function executeRunCommand(config, command) {
   const abortController = new AbortController();
   const stopActiveRunHeartbeats = startActiveRunHeartbeats(config, command, abortController);
   const protectedExecutorValues = managedMcpProfile?.protectedValues ?? (managedMcpProfile ? [governedMcp.sessionToken] : []);
-  const liveOutputLogger = createLiveOutputLogger(config, command, executor.kind, protectedExecutorValues);
+  const runtimeArtifacts = [];
+  const runtimeArtifactIngest = createRuntimeArtifactIngestQueue({
+    ingest: (results) => ingestRuntimeArtifacts(config, command, cwd, results),
+    onError: () => abortController.abort()
+  });
+  const liveOutputLogger = createLiveOutputLogger(
+    config,
+    command,
+    executor.kind,
+    protectedExecutorValues,
+    (results) => runtimeArtifactIngest.enqueue(results)
+  );
   let execution;
   try {
     try {
@@ -7812,6 +7866,7 @@ async function executeRunCommand(config, command) {
     } finally {
       await liveOutputLogger.flush();
     }
+    runtimeArtifacts.push(...await runtimeArtifactIngest.flush());
     execution.stdout = redactProtectedText(execution.stdout, protectedExecutorValues);
     execution.stderr = redactProtectedText(execution.stderr, protectedExecutorValues);
     patchActiveRunCommand(command, {
@@ -7868,7 +7923,15 @@ async function executeRunCommand(config, command) {
       ...Array.isArray(parsed.mcpToolResults) ? parsed.mcpToolResults.map(asRecord) : [],
       ...liveOutputLogger.mcpToolResults().map(asRecord)
     ];
-    const runtimeArtifacts = await ingestRuntimeArtifacts(config, command, cwd, mcpToolResults);
+    runtimeArtifacts.push(...await ingestRuntimeArtifacts(
+      config,
+      command,
+      cwd,
+      mcpToolResults.filter((result3) => {
+        const intentId = readString(asRecord(result3).artifactIntent?.intentId);
+        return !intentId || !runtimeArtifactIngest.hasHandled(intentId);
+      })
+    ));
     const shouldPreserveNativeSession = managedMcpProfile && parsed.sessionId && (execution.exitCode === 0 || execution.completionOutputType === "approval_required") && !execution.timedOut && execution.cancelled !== true && !execution.spawnError && ["codex", "pi"].includes(executor.kind) && mcpToolResults.some((result3) => readString(result3.status) === "approval_required");
     if (shouldPreserveNativeSession) {
       try {

package/dist/amaster-runtime.mjs

@@ -5,7 +5,7 @@ import { dirname, join, resolve } from "node:path";
 import { homedir, hostname } from "node:os";
 import { fileURLToPath } from "node:url";
 
-const CONNECTOR_VERSION = "0.1.0-beta.23";
+const CONNECTOR_VERSION = "0.1.0-beta.25";
 
 const CAPABILITIES = [
   "remote_registration",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amaster.ai/employee-runtime-connector",
-  "version": "0.1.0-beta.23",
+  "version": "0.1.0-beta.25",
   "description": "AMaster Employee runtime connector CLI and daemon",
   "license": "MIT",
   "type": "module",