@orchestraworks/worker-darwin-arm64 0.0.140 → 0.0.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orchestraworks/worker-darwin-arm64",
-  "version": "0.0.140",
+  "version": "0.0.142",
   "description": "Orchestra worker for darwin arm64.",
   "license": "Apache-2.0",
   "author": "Living Computers",

package/script-harness/index.js

@@ -3,10 +3,10 @@
 // line-delimited stdio JSON-RPC. One process per bridge multiplexes every session over one stdio pipe,
 // so the read loop must never block on an in-flight command.
 //
-// Each turn ends by setting the session's outcome claim from the command's exit code. A machine the
-// customer enrolled, which the worker declares by setting `SFDK_MACHINE_ENROLLED`, has no edge of ours in
-// front of it, so every claim there would be refused: the harness makes no call at all and ends the turn
-// on the script's own answer.
+// Each turn ends by setting the session's outcome claim from the command's exit code, sent with the agent's
+// own token when the harness has one. A machine with no edge of ours in front of it, which the worker
+// declares on each harness process, refuses a bare claim: with no token there the harness makes no call at
+// all and ends the turn on the script's own answer.
 
 import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
@@ -18,7 +18,7 @@ import { createInterface } from "node:readline";
 import { describeFetchFailure } from "./fetch-failure.js";
 
 const HARNESS_NAME = "software-factory-script-harness";
-const HARNESS_VERSION = "0.0.140";
+const HARNESS_VERSION = "0.0.142";
 
 const IS_WINDOWS = process.platform === "win32";
 
@@ -257,8 +257,6 @@ try {
   programReadError = `cannot read instructions file: ${error.message}`;
 }
 
-// NO Authorization header is ever attached — the egress broker mints and injects the short-lived agent
-// bearer for the agent-API destination (the agent runtime must never hold credentials).
 function agentApiBaseUrl() {
   const configured = (process.env.PLATFORM_BASE_URL || "").trim().replace(/\/+$/, "");
   if (!configured) {
@@ -269,22 +267,58 @@ function agentApiBaseUrl() {
 
 // The worker declares this on a machine the customer enrolled, and on no machine the platform launched.
 // Presence is the declaration. The worker answers it from that machine's own bootstrap rather than
-// passing a value through, so nothing running inside the machine can declare it of itself.
-const MACHINE_ENROLLED = "SFDK_MACHINE_ENROLLED";
+// passing a value through, so nothing running inside the machine can declare it of itself. A worker built
+// before the rename declares it under the former name alone, which is read second.
+const MACHINE_ENROLLED = ["ORCHESTRA_MACHINE_ENROLLED", "SFDK_MACHINE_ENROLLED"];
+
+/** The name the worker declared this machine enrolled under, or undefined on a machine the platform launched. */
+function enrolledDeclaration() {
+  return MACHINE_ENROLLED.find((name) => (process.env[name] || "").trim() !== "");
+}
+
+// The worker renews the file in place, so it is read on every call. Behind our edge the edge replaces
+// this bearer with one for the same agent.
+function agentToken() {
+  const variable = (process.env.ORCHESTRA_API_TOKEN || "").trim();
+  if (variable) return variable;
+  const file = (process.env.ORCHESTRA_API_TOKEN_FILE || "").trim();
+  if (!file) return undefined;
+  try {
+    return readFileSync(file, "utf8").trim() || undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+// The CLI's transport rule: a bearer goes over https, or over plain http only to this machine itself.
+const LOOPBACK_HOSTS = new Set(["127.0.0.1", "localhost", "::1"]);
 
-function machineIsEnrolled() {
-  return (process.env[MACHINE_ENROLLED] || "").trim() !== "";
+function carriesBearer(baseUrl) {
+  let url;
+  try {
+    url = new URL(baseUrl);
+  } catch {
+    return false;
+  }
+  if (url.protocol === "https:") return true;
+  return url.protocol === "http:" && LOOPBACK_HOSTS.has(url.hostname.replace(/^\[|\]$/g, ""));
 }
 
-async function platformRequest(method, path, organizationId, body) {
+async function platformRequest(method, path, organizationId, body, token = agentToken()) {
   let response;
   try {
-    response = await fetch(`${agentApiBaseUrl()}${path}`, {
+    const baseUrl = agentApiBaseUrl();
+    if (token && !carriesBearer(baseUrl)) {
+      logDiagnostic("PLATFORM_BASE_URL is neither https nor this machine, so the agent token is not sent to it");
+      token = undefined;
+    }
+    response = await fetch(`${baseUrl}${path}`, {
       method,
       headers: {
         "Content-Type": "application/json",
         Accept: "application/json",
         "X-Organization-Id": organizationId,
+        ...(token ? { Authorization: `Bearer ${token}` } : {}),
       },
       body: body === undefined ? undefined : JSON.stringify(body),
       signal: AbortSignal.timeout(PLATFORM_REQUEST_TIMEOUT_MS),
@@ -660,16 +694,18 @@ async function claimPlatformState({
 }) {
   const { succeed, fail } = turnResponder(id, errorData, settlement);
 
-  // On a machine the customer enrolled there is no edge of ours, so nothing authorizes a call to the
-  // platform's API and every claim here would come back refused — failing a turn whose script succeeded
-  // and whose answer is already on the session. The answer is then the whole of what the turn reports.
-  // Read off the worker's declaration and not off a missing edge stamp: a machine the platform launched
-  // can be missing that stamp too, and there the refusal is a deployment fault to surface rather than a
-  // turn to settle quietly.
-  if (machineIsEnrolled()) {
+  // On a machine with no edge of ours and no agent token, nothing authorizes a call to the platform's
+  // API and every claim would come back refused — failing a turn whose script succeeded and whose answer
+  // is already on the session. The answer is then the whole of what the turn reports. Read off the
+  // worker's declaration and not off a missing edge stamp: a machine the platform launched can be missing
+  // that stamp too, and there the refusal is a deployment fault to surface rather than a turn to settle
+  // quietly.
+  const token = agentToken();
+  const declaration = enrolledDeclaration();
+  if (declaration !== undefined && !token) {
     logDiagnostic(
-      `${MACHINE_ENROLLED} is set, so this machine is one the platform did not launch and nothing ` +
-        `authorizes its calls to the platform: this turn claims no session state and settles on its answer`,
+      `${declaration} is set and no agent token is readable, so nothing authorizes this machine's ` +
+        `calls to the platform: this turn claims no session state and settles on its answer`,
     );
     succeed(answerText);
     return;
@@ -680,7 +716,7 @@ async function claimPlatformState({
       ? { outcome: "ACHIEVED", summary: "exit 0" }
       : { outcome: "FAILED", summary: `exit ${exitCode}: ${tail(stderrTail, STDERR_TAIL_SUMMARY)}` };
   const sessionPath = `/sessions/${encodeURIComponent(platformSessionId)}`;
-  const response = await platformRequest("PATCH", sessionPath, organizationId, body);
+  const response = await platformRequest("PATCH", sessionPath, organizationId, body, token);
   if (!response.ok && response.status !== 409) {
     fail(`claim rejected: ${response.status}`);
     return;

package/script-harness/package.json

@@ -1,7 +1,7 @@
 {
   "name": "software-factory-script-harness",
   "type": "module",
-  "version": "0.0.140",
+  "version": "0.0.142",
   "scripts": {
     "test": "node --test test/*.test.js"
   }

package/worker

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/worker
-size: 46312466 bytes
-sha256: eff614017d0d021de7a7d2cf54271777be1e6bedaac7c7dcbd12640af83f1060
+size: 46512002 bytes
+sha256: 7cbdd29779395d8ea71bb971f6810ebc09ec453f17388419b4c2a7f13f7b6e61