@byok-sdk/client 0.9.1 → 0.10.1

package/dist/bin/byok-agent.js

@@ -6057,13 +6057,15 @@ var AuthManager = class {
         }
         const keyPair = existing ? { privateKey: importPrivateKeyPem(existing.devicePrivateKeyPem), publicKeyBase64Url: existing.devicePublicKey } : generateDeviceKeyPair();
         const url = new URL(BYOK_PAIR_PATH, toHttpBase(this.opts.serverUrl));
+        const machineId = await this.opts.machineId?.();
         const res = await fetch(url, {
           method: "POST",
           headers: { "content-type": "application/json" },
           body: JSON.stringify({
             pairingCode,
             deviceName: this.opts.deviceName ?? os__default.hostname(),
-            devicePublicKey: keyPair.publicKeyBase64Url
+            devicePublicKey: keyPair.publicKeyBase64Url,
+            ...machineId === void 0 ? {} : { machineId }
           })
         });
         if (!res.ok) {
@@ -6372,6 +6374,67 @@ var BlobClient = class {
     throw lastFailure;
   }
 };
+var DEFAULT_TIMEOUT_MS2 = 2e3;
+var DARWIN_UUID_RE = /"IOPlatformUUID"\s*=\s*"([^"]+)"/u;
+var WIN32_GUID_RE = /MachineGuid\s+REG_SZ\s+(\S+)/u;
+var LINUX_MACHINE_ID_PATHS = ["/etc/machine-id", "/var/lib/dbus/machine-id"];
+async function probeDarwin(run) {
+  const result = await run("ioreg", ["-rd1", "-c", "IOPlatformExpertDevice"]);
+  if (result.exitCode !== 0) return void 0;
+  return DARWIN_UUID_RE.exec(result.stdout)?.[1];
+}
+async function probeLinux(readFile3) {
+  for (const path41 of LINUX_MACHINE_ID_PATHS) {
+    try {
+      const contents = (await readFile3(path41)).trim();
+      if (contents.length > 0) return contents;
+    } catch {
+    }
+  }
+  return void 0;
+}
+async function probeWin32(run) {
+  const result = await run("reg", [
+    "query",
+    "HKLM\\SOFTWARE\\Microsoft\\Cryptography",
+    "/v",
+    "MachineGuid"
+  ]);
+  if (result.exitCode !== 0) return void 0;
+  return WIN32_GUID_RE.exec(result.stdout)?.[1];
+}
+async function withTimeout(probe, timeoutMs) {
+  let timer;
+  const expiry = new Promise((resolve) => {
+    timer = setTimeout(() => resolve(void 0), timeoutMs);
+    timer.unref?.();
+  });
+  try {
+    return await Promise.race([probe, expiry]);
+  } finally {
+    if (timer !== void 0) clearTimeout(timer);
+  }
+}
+async function resolveMachineId(options) {
+  const platform = options.platform ?? process.platform;
+  const run = options.run ?? runDeviceCommand;
+  const readFile3 = options.readFile ?? ((path41) => fs12.readFile(path41, "utf8"));
+  let probe;
+  if (platform === "darwin") probe = probeDarwin(run);
+  else if (platform === "linux") probe = probeLinux(readFile3);
+  else if (platform === "win32") probe = probeWin32(run);
+  if (probe === void 0) return void 0;
+  let raw;
+  try {
+    raw = await withTimeout(probe, options.timeoutMs ?? DEFAULT_TIMEOUT_MS2);
+  } catch {
+    return void 0;
+  }
+  const trimmed = raw?.trim();
+  if (trimmed === void 0 || trimmed.length === 0) return void 0;
+  return createHash("sha256").update(`${options.productId}
+${trimmed}`, "utf8").digest("hex");
+}
 var PRESENCE_HINTS_CAPABILITY = "presence.hints";
 var CapabilityDiscoveryError = class extends Error {
   constructor(message, options) {
@@ -11005,7 +11068,7 @@ async function readPinnedFile(directory, fileName, maxBytes = AGENT_MEMORY_MAX_F
     });
   }
 }
-async function readFile(context, relativePath, maxBytes = AGENT_MEMORY_MAX_FILE_BYTES) {
+async function readFile2(context, relativePath, maxBytes = AGENT_MEMORY_MAX_FILE_BYTES) {
   if (context.filesystem !== void 0) return context.filesystem.read(relativePath, maxBytes);
   return withMemoryParent(context, relativePath, (directory, fileName) => readPinnedFile(directory, fileName, maxBytes));
 }
@@ -11173,7 +11236,7 @@ var AgentMemoryService = class {
     const context = taskContext(this.input);
     const relativePath = validateAgentMemoryPath(input.path);
     if (input.ifRevision !== void 0 && !revision(input.ifRevision)) throw new AgentMemoryError("ifRevision must be a sha256 content revision");
-    const current = await readFile(context, relativePath);
+    const current = await readFile2(context, relativePath);
     if (!current.exists) throw new AgentMemoryError("memory file does not exist");
     if (input.ifRevision !== void 0 && current.revision !== input.ifRevision) throw new AgentMemoryRevisionConflictError(input.ifRevision, current.revision);
     const auditWarning = await exclusiveAgentMemoryHome(context.canonicalHome, () => recordAuditWarning(context, "recall", {
@@ -11260,7 +11323,7 @@ async function captureAgentMemorySnapshot(input) {
   const files = [];
   let totalBytes = 0;
   for (const relativePath of paths) {
-    const current = await readFile(context, relativePath);
+    const current = await readFile2(context, relativePath);
     if (!current.exists) {
       if (relativePath === "MEMORY.md") throw new AgentMemoryError("MEMORY.md disappeared before snapshot");
       continue;
@@ -12776,6 +12839,7 @@ var TaskRunner = class {
         gitLease,
         gitBaseline,
         summaryParts: [],
+        finalTextParts: [],
         batcher: new ProgressBatcher(
           (seq, events) => {
             const projected = active.egressEnabled ? this.deps.agentEgress?.projectLatestValue({
@@ -13081,6 +13145,9 @@ var TaskRunner = class {
         if (event.type === "usage") {
           active.lastUsage = event;
         }
+        if (event.type === "tool_use" || event.type === "tool_result" || event.type === "needs_approval") {
+          active.finalTextParts.length = 0;
+        }
         if (event.type === "needs_approval") {
           active.batcher.flush();
           const { taskId } = active;
@@ -13114,7 +13181,8 @@ var TaskRunner = class {
               this.sendAgentMessageRecord(outbox, record);
               return;
             }
-            const body = finalOutput.trim();
+            const finalTextRun = active.finalTextParts.join("").trim();
+            const body = finalTextRun !== "" ? finalTextRun : finalOutput.trim();
             if (outbox === void 0 || active.agentRef === void 0) {
               active.pendingMessageCompletion = void 0;
               await this.fail(active.taskId, "required Agent message lane is unavailable for this task", false);
@@ -13158,6 +13226,7 @@ var TaskRunner = class {
         }
         if (event.type === "progress") {
           active.summaryParts.push(event.text);
+          active.finalTextParts.push(event.text);
         }
         if (event.type === "artifact") {
           if (active.agentRef !== void 0 && this.deps.agentEgress !== void 0) {
@@ -16242,6 +16311,7 @@ function buildDaemonWithAdapters(config, adapters, overrides = {}, assertionProb
       serverUrl: config.serverUrl,
       store,
       deviceName: config.deviceName,
+      machineId: config.machineId ?? (() => resolveMachineId({ productId: config.productId })),
       onRevoked: () => {
         connectionState = "revoked";
       }
@@ -17540,7 +17610,7 @@ function connectAndHandshake(endpoint, token, opts) {
     });
   });
 }
-function withTimeout(promise, ms, message) {
+function withTimeout2(promise, ms, message) {
   return new Promise((resolve, reject) => {
     const timer = setTimeout(() => reject(new Error(message)), ms);
     timer.unref?.();
@@ -17619,7 +17689,7 @@ function createControlClient(socket, reader, opts) {
     async request(method, params) {
       if (closed) throw new Error("control connection is closed");
       const { promise } = send(method, params);
-      const result = await withTimeout(promise, opts.requestTimeoutMs ?? 1e4, `control request "${method}" timed out`);
+      const result = await withTimeout2(promise, opts.requestTimeoutMs ?? 1e4, `control request "${method}" timed out`);
       return result;
     },
     subscribe(method, params, onEvent) {
@@ -17729,7 +17799,7 @@ ${args.map((a) => `    ${plistString(a)}`).join("\n")}
 }
 function createLaunchdLifecycle(def, deps = {}) {
   const run = deps.run ?? defaultRunner;
-  const fs30 = deps.fs ?? promises;
+  const fs31 = deps.fs ?? promises;
   const homedir = deps.homedir ?? (() => os__default.homedir());
   const getuid = deps.getuid ?? (() => {
     if (typeof process.getuid !== "function") {
@@ -17743,7 +17813,7 @@ function createLaunchdLifecycle(def, deps = {}) {
   const serviceTarget = () => `${domainTarget()}/${label}`;
   async function fileExists(p) {
     try {
-      await fs30.stat(p);
+      await fs31.stat(p);
       return true;
     } catch {
       return false;
@@ -17751,9 +17821,9 @@ function createLaunchdLifecycle(def, deps = {}) {
   }
   async function writePlist(program) {
     const xml = generateLaunchdPlist({ label, program, logDir: def.logDir });
-    await fs30.mkdir(path3__default.dirname(plistPath()), { recursive: true });
-    await fs30.mkdir(def.logDir, { recursive: true });
-    await fs30.writeFile(plistPath(), xml, "utf8");
+    await fs31.mkdir(path3__default.dirname(plistPath()), { recursive: true });
+    await fs31.mkdir(def.logDir, { recursive: true });
+    await fs31.writeFile(plistPath(), xml, "utf8");
   }
   async function install(opts = {}) {
     await writePlist(opts.program ?? def.program);
@@ -17764,7 +17834,7 @@ function createLaunchdLifecycle(def, deps = {}) {
   }
   async function uninstall() {
     await runIdempotent(run, "launchctl", ["bootout", serviceTarget()], "launchctl bootout", LAUNCHD_NOT_LOADED);
-    await fs30.rm(plistPath(), { force: true });
+    await fs31.rm(plistPath(), { force: true });
   }
   async function start() {
     if (!await fileExists(plistPath())) {
@@ -17848,14 +17918,14 @@ WantedBy=default.target
 }
 function createSystemdLifecycle(def, deps = {}) {
   const run = deps.run ?? defaultRunner;
-  const fs30 = deps.fs ?? promises;
+  const fs31 = deps.fs ?? promises;
   const homedir = deps.homedir ?? (() => os__default.homedir());
   const name = sanitizeServiceName(def.name);
   const unitName = `${name}.service`;
   const unitPath = () => path3__default.join(homedir(), ".config", "systemd", "user", unitName);
   async function fileExists(p) {
     try {
-      await fs30.stat(p);
+      await fs31.stat(p);
       return true;
     } catch {
       return false;
@@ -17863,9 +17933,9 @@ function createSystemdLifecycle(def, deps = {}) {
   }
   async function writeUnit(program) {
     const unit = generateSystemdUnit({ name, displayName: def.displayName ?? def.name, program, logDir: def.logDir });
-    await fs30.mkdir(path3__default.dirname(unitPath()), { recursive: true });
-    await fs30.mkdir(def.logDir, { recursive: true });
-    await fs30.writeFile(unitPath(), unit, "utf8");
+    await fs31.mkdir(path3__default.dirname(unitPath()), { recursive: true });
+    await fs31.mkdir(def.logDir, { recursive: true });
+    await fs31.writeFile(unitPath(), unit, "utf8");
   }
   async function install(opts = {}) {
     await writeUnit(opts.program ?? def.program);
@@ -17874,7 +17944,7 @@ function createSystemdLifecycle(def, deps = {}) {
   }
   async function uninstall() {
     await runIdempotent(run, "systemctl", ["--user", "disable", "--now", unitName], "systemctl disable --now", SYSTEMD_NOT_LOADED);
-    await fs30.rm(unitPath(), { force: true });
+    await fs31.rm(unitPath(), { force: true });
     await run("systemctl", ["--user", "daemon-reload"]);
   }
   async function start() {
@@ -17937,7 +18007,7 @@ ${argXml}${cwdXml}
 }
 function createWinswLifecycle(def, deps = {}) {
   const run = deps.run ?? defaultRunner;
-  const fs30 = deps.fs ?? promises;
+  const fs31 = deps.fs ?? promises;
   const windows = def.windows;
   if (!windows) {
     throw new Error("WinSW service lifecycle requires `ServiceDefinition.windows.winswBin` (the product-bundled WinSW executable path)");
@@ -17949,7 +18019,7 @@ function createWinswLifecycle(def, deps = {}) {
   const xmlPath = path3__default.join(installDir, `${id}.xml`);
   async function fileExists(p) {
     try {
-      await fs30.stat(p);
+      await fs31.stat(p);
       return true;
     } catch {
       return false;
@@ -17957,10 +18027,10 @@ function createWinswLifecycle(def, deps = {}) {
   }
   async function writeFiles(program) {
     const xml = generateWinswXml({ id, displayName: def.displayName ?? def.name, program, logDir: def.logDir });
-    await fs30.mkdir(installDir, { recursive: true });
-    await fs30.mkdir(def.logDir, { recursive: true });
-    await fs30.copyFile(winswBin, exePath);
-    await fs30.writeFile(xmlPath, xml, "utf8");
+    await fs31.mkdir(installDir, { recursive: true });
+    await fs31.mkdir(def.logDir, { recursive: true });
+    await fs31.copyFile(winswBin, exePath);
+    await fs31.writeFile(xmlPath, xml, "utf8");
   }
   async function install(opts = {}) {
     await writeFiles(opts.program ?? def.program);
@@ -17970,8 +18040,8 @@ function createWinswLifecycle(def, deps = {}) {
   async function uninstall() {
     await runIdempotent(run, exePath, ["stop"], "winsw stop", WINSW_NOT_INSTALLED);
     await runIdempotent(run, exePath, ["uninstall"], "winsw uninstall", WINSW_NOT_INSTALLED);
-    await fs30.rm(exePath, { force: true });
-    await fs30.rm(xmlPath, { force: true });
+    await fs31.rm(exePath, { force: true });
+    await fs31.rm(xmlPath, { force: true });
   }
   async function start() {
     if (!await fileExists(xmlPath)) {
@@ -18016,7 +18086,7 @@ function createServiceLifecycle(def, opts = {}) {
 
 // src/bin/official-release.ts
 var OFFICIAL_LOCAL_AGENT_RELEASE = resolveLocalAgentReleaseIdentity({
-  version: "0.9.1"
+  version: "0.10.1"
 });
 
 // src/bin/config.ts