@archme/cli 0.15.1 → 0.16.0

package/dist/cli.js

@@ -19607,6 +19607,45 @@ var init_claimStance = __esm({
   }
 });
 
+// src/daemon/platformDevices.ts
+async function readPlatformDevices(client, userId) {
+  const { data, error } = await client.from("agent_devices").select("id, name").eq("user_id", userId).is("org_id", null).eq("is_platform", true).eq("status", "enabled");
+  if (error) throw new Error(error.message);
+  return data ?? [];
+}
+function withPlatformDevices(devices, platform3) {
+  const out = [...devices];
+  for (const p of platform3) {
+    if (!out.some((d) => d.deviceId === p.id)) out.push({ orgId: null, deviceId: p.id });
+  }
+  return out;
+}
+function deviceForOrgLookup(devices) {
+  const members = devices.filter((d) => d.orgId !== null);
+  const byOrg = new Map(members.map((d) => [d.orgId, d.deviceId]));
+  return (orgId) => byOrg.get(orgId) ?? members[0]?.deviceId ?? null;
+}
+function poolBootLine(platform3, mode) {
+  if (platform3.length === 0) return "not in managed pool";
+  const names = platform3.map((p) => `${p.name} (${p.id})`).join(", ");
+  return `in managed pool: platform device ${names}, ${mode === "required" ? "active" : "inactive unless sandbox=required"}`;
+}
+async function discoverClaimDevices(client, userId, devices, mode, out = console) {
+  let platform3 = [];
+  try {
+    platform3 = await readPlatformDevices(client, userId);
+  } catch (e) {
+    out.warn(`platform device read failed, starting member-only until restart: ${e.message}`);
+  }
+  out.log(`  ${poolBootLine(platform3, mode)}`);
+  return { devices: withPlatformDevices(devices, platform3), platform: platform3 };
+}
+var init_platformDevices = __esm({
+  "src/daemon/platformDevices.ts"() {
+    "use strict";
+  }
+});
+
 // src/daemon/sandboxJob/result.ts
 import { readFile as readFile13 } from "node:fs/promises";
 function isValidNonce(nonce) {
@@ -23236,14 +23275,16 @@ async function rpcSetDaemonPause(ctx, pauseUntil, reason, detail) {
     console.error(`set_daemon_pause failed: ${error.message}`);
   }
 }
-async function rpcReportEvent(ctx, orgId, eventType, payload) {
+async function rpcReportEvent(ctx, job, deviceId, eventType, payload) {
   try {
     const { error } = await withAuthRetry(
       "report_daemon_event",
       () => ctx.supabase.rpc("report_daemon_event", {
-        p_org_id: orgId,
+        p_org_id: job.org_id,
         p_event_type: eventType,
-        p_payload: payload
+        p_payload: payload,
+        p_job_id: job.id,
+        p_device_id: deviceId
       }),
       ctx.reLogin
     );
@@ -23752,7 +23793,7 @@ async function runJob(ctx, job, claimDeviceId) {
         Object.assign(timings, outcome.metrics.durations_ms);
         Object.assign(metrics, outcome.metrics, { durations_ms: timings });
         const sandboxMetrics = outcome.metrics.sandbox;
-        void rpcReportEvent(ctx, job.org_id, "sandbox_job_metrics", {
+        await rpcReportEvent(ctx, job, deviceId, "sandbox_job_metrics", {
           job_id: job.id,
           project_id: job.project_id,
           outcome: outcome.kind,
@@ -24133,7 +24174,7 @@ ${logs.stderr}`, sentPrompt);
     if (plan) {
       const { parsed, pauseUntil, info } = plan;
       if (!parsed) {
-        void rpcReportEvent(ctx, job.org_id, "rate_limit_unmatched_exit", {
+        await rpcReportEvent(ctx, job, deviceId, "rate_limit_unmatched_exit", {
           job_id: job.id,
           excerpt: [runErr?.claudeError?.text, haystack].filter(Boolean).join("\n").slice(0, 500)
         });
@@ -24476,7 +24517,9 @@ async function runDaemon() {
   const via = usedFallback ? ` (via device ${active.cred.device_id})` : "";
   const accountUserId = auth.getUserId() ?? "OAuth account";
   console.log(`  account ${accountUserId}: ${active.result.user.email ?? "OAuth user"} (${devices.length} org(s))${via}`);
-  const byOrg = new Map(devices.map((d) => [d.orgId, d.deviceId]));
+  const discovered = await discoverClaimDevices(client, auth.getUserId() ?? "", devices, sandboxSettings.mode);
+  platformDevices = new Set(discovered.platform.map((p) => p.id));
+  const claimDevices = discovered.devices;
   const sessions = [{
     supabase: client,
     auth,
@@ -24486,16 +24529,9 @@ async function runDaemon() {
     supabaseUrl: SUPABASE_URL,
     cloneBaseDir: CLONE_BASE_DIR,
     reLogin: () => auth.reauthenticate(),
-    devices,
-    deviceForOrg: (orgId) => byOrg.get(orgId) ?? devices[0]?.deviceId ?? null
+    devices: claimDevices,
+    deviceForOrg: deviceForOrgLookup(claimDevices)
   }];
-  try {
-    const { data, error } = await client.from("agent_devices").select("id, is_platform").in("id", devices.map((d) => d.deviceId));
-    if (error) throw new Error(error.message);
-    platformDevices = new Set((data ?? []).filter((d) => d.is_platform).map((d) => d.id));
-  } catch (e) {
-    console.warn(`agent_devices.is_platform read failed (treating devices as not platform): ${e.message}`);
-  }
   if (sandboxSettings.mode !== "off") {
     try {
       const { createSandboxParts: createSandboxParts2 } = await Promise.resolve().then(() => (init_parts(), parts_exports));
@@ -24733,6 +24769,7 @@ var init_run = __esm({
     init_architectureCounts();
     init_imageManifest();
     init_claimStance();
+    init_platformDevices();
     init_claudeVersion();
     init_host();
     init_runSandboxedJob();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archme/cli",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "Map your codebase into a living architecture diagram: run `archme init` in a repo to scan it, `archme daemon start` to keep it current on every commit.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",

package/sandbox-image.json

@@ -1,4 +1,4 @@
 {
   "image": "ghcr.io/architectme/archme-job",
-  "digest": "sha256:a3c757d0dc7608b3c4e45b24e1ba4459c8f7ece2d0551a4633d2f3833a6fdc3e"
+  "digest": "sha256:3f8b289540503cc18a2794fa9de858e75a4ceb2d3cf709d814cf816569c36a96"
 }