@archme/cli 0.8.2 → 0.9.1

package/dist/cli.js

@@ -10399,6 +10399,9 @@ function buildClaudeArgs(opts) {
     "--allowedTools",
     tools
   ];
+  if (opts.builtinTools) {
+    args.push("--tools", opts.builtinTools.join(","));
+  }
   if (opts.jsonOutput && !opts.interactive) {
     args.push("--output-format", "json");
   }
@@ -10682,6 +10685,18 @@ var init_digestPrompt = __esm({
 import { mkdtemp as mkdtemp2, rm as rm6, writeFile as writeFile5 } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join8 } from "node:path";
+function digestSpawnOpts(o2) {
+  return {
+    prompt: o2.prompt,
+    mcpConfigPath: o2.mcpConfigPath,
+    cwd: o2.cwd,
+    allowedTools: o2.mcp?.allowedTools ?? [],
+    // tool-less unless the caller wired MCP reads
+    builtinTools: [],
+    timeoutMs: DIGEST_TIMEOUT_MS,
+    model: o2.model
+  };
+}
 function isCleanDigestExit(res) {
   return !res.timedOut && res.signal == null && res.exitCode === 0;
 }
@@ -10724,15 +10739,13 @@ async function runDigestJob(ctx, job, deviceId, inFlight2, mcp) {
       await writeFile5(mcpConfigPath, JSON.stringify({ mcpServers: {} }));
     }
     const model = await resolveRunnableModel(ctx.supabase);
-    const proc = spawnClaude({
+    const proc = spawnClaude(digestSpawnOpts({
       prompt: buildDigestPrompt(payload),
       mcpConfigPath,
       cwd: dir,
-      allowedTools: mcp?.allowedTools ?? [],
-      // tool-less unless the caller wired MCP reads
-      timeoutMs: DIGEST_TIMEOUT_MS,
-      model
-    });
+      model,
+      mcp
+    }));
     inFlight2?.set(job.id, proc);
     const res = await proc;
     const narrative = (typeof res.stdout === "string" ? res.stdout : "").trim();
@@ -17151,6 +17164,7 @@ var init_localPoller = __esm({
 // src/daemon/run.ts
 var run_exports = {};
 __export(run_exports, {
+  JOB_TOKEN_PREFIX: () => JOB_TOKEN_PREFIX,
   MultipleAccountsError: () => MultipleAccountsError,
   __testDispatch: () => __testDispatch,
   affectedFieldForComplete: () => affectedFieldForComplete,
@@ -17162,6 +17176,7 @@ __export(run_exports, {
   claudeFailureDetail: () => claudeFailureDetail,
   computeDiff: () => computeDiff,
   parseClaudeResult: () => parseClaudeResult,
+  parseJobTokenResponse: () => parseJobTokenResponse,
   probeMcpAuth: () => probeMcpAuth,
   readBranchMarker: () => readBranchMarker,
   routeShutdownInterrupt: () => routeShutdownInterrupt,
@@ -17254,6 +17269,56 @@ async function getRepoCredentials(ctx, jobId, deviceId) {
     expires_at: typeof body.expires_at === "string" ? body.expires_at : null
   };
 }
+function parseJobTokenResponse(status, ok, body) {
+  if (!ok) {
+    throw new Error(`MCP job token unavailable: ${responseError(body, `job-token failed (${status})`)}`);
+  }
+  if (typeof body.token !== "string" || !body.token.startsWith(JOB_TOKEN_PREFIX) || body.token.length <= JOB_TOKEN_PREFIX.length) {
+    throw new Error("MCP job token response did not carry an amj_ token");
+  }
+  const str2 = (v) => typeof v === "string" ? v : null;
+  return {
+    token: body.token,
+    expires_at: str2(body.expires_at),
+    project_id: str2(body.project_id),
+    archme_branch: str2(body.archme_branch),
+    scope: str2(body.scope)
+  };
+}
+async function mintJobToken(ctx, jobId, deviceId) {
+  const response = await fetchWithAuthRetry(
+    "job-token",
+    () => {
+      const accessToken = ctx.auth.getAccessToken();
+      if (!accessToken) throw new Error("daemon is not signed in with a registered device");
+      return fetch(`${ctx.supabaseUrl.replace(/\/$/, "")}/functions/v1/agents-device/job-token`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${accessToken}`
+        },
+        body: JSON.stringify({
+          device_id: deviceId,
+          job_id: jobId
+        })
+      });
+    },
+    ctx.reLogin
+  );
+  const body = await parseJsonResponse(response);
+  return parseJobTokenResponse(response.status, response.ok, body);
+}
+async function writeAgentMcpConfig(ctx, job, deviceId, projectSlug, source) {
+  const { token } = await mintJobToken(ctx, job.id, deviceId);
+  const { configPath, cleanup } = await writeMcpConfig({
+    baseUrl: ctx.mcpBaseUrl,
+    projectSlug,
+    branch: job.archme_branch,
+    bearer: token,
+    source
+  });
+  return { configPath, cleanup, bearer: token };
+}
 async function buildGitEnv(credentials) {
   const dir = await mkdtemp3(join19(tmpdir3(), "archme-git-askpass-"));
   const askpassPath = join19(dir, "askpass.sh");
@@ -17805,7 +17870,7 @@ async function probeMcpAuth(mcpUrl, bearer, opts = {}) {
         body
       });
       lastStatus = res.status;
-      if (res.status !== 401) {
+      if (res.status !== 401 && res.status !== 403) {
         return {
           ok: true,
           attempts: i2 + 1,
@@ -17813,13 +17878,13 @@ async function probeMcpAuth(mcpUrl, bearer, opts = {}) {
           detail: `MCP accepted the daemon token (status ${res.status})`
         };
       }
-      lastDetail = "MCP returned 401 \u2014 token rejected by JWKS verification";
+      lastDetail = res.status === 403 ? "MCP returned 403 \u2014 job token rejected (job not running under this claim, or URL outside its binding)" : "MCP returned 401 \u2014 token rejected by JWKS verification";
     } catch (err2) {
       lastStatus = null;
       lastDetail = `network error reaching MCP: ${err2 instanceof Error ? err2.message : String(err2)}`;
     }
   }
-  if (lastStatus === 401) {
+  if (lastStatus === 401 || lastStatus === 403) {
     return { ok: false, attempts, lastStatus, detail: lastDetail };
   }
   return {
@@ -17894,19 +17959,12 @@ function parseClaudeResult(stdout) {
     return { summary: raw, modelServed: null, usage: null, costUsd: null, isError: false, parsed: false };
   }
 }
-async function setupDigestMcp(ctx, job) {
+async function setupDigestMcp(ctx, job, deviceId) {
   let cleanup;
   try {
+    if (!deviceId) throw new Error("daemon is not signed in with a registered device");
     const projectSlug = await lookupProjectSlug(ctx.supabase, job.project_id);
-    const mcpBearer = await ctx.auth.getMcpAccessToken();
-    const { configPath, cleanup: cleanupFn } = await writeMcpConfig({
-      baseUrl: ctx.mcpBaseUrl,
-      projectSlug,
-      branch: job.archme_branch,
-      bearer: mcpBearer
-      // No `source`: digest reads must not produce source-tagged commits — they
-      // don't write at all, but leaving it off keeps the URL read-shaped.
-    });
+    const { configPath, cleanup: cleanupFn, bearer: mcpBearer } = await writeAgentMcpConfig(ctx, job, deviceId, projectSlug);
     cleanup = cleanupFn;
     const probe = await probeMcpAuth(
       `${ctx.mcpBaseUrl}?project=${encodeURIComponent(projectSlug)}&branch=${encodeURIComponent(job.archme_branch)}`,
@@ -17929,7 +17987,7 @@ async function setupDigestMcp(ctx, job) {
 async function runJob(ctx, job, claimDeviceId) {
   if (job.job_kind === "digest") {
     const digestDevice = claimDeviceId ?? ctx.deviceForOrg(job.org_id) ?? ctx.auth.getDeviceId() ?? void 0;
-    const { mcp, cleanup } = await setupDigestMcp(ctx, job);
+    const { mcp, cleanup } = await setupDigestMcp(ctx, job, digestDevice);
     try {
       await runDigestJob(ctx, job, digestDevice, inFlight, mcp);
     } finally {
@@ -17961,6 +18019,27 @@ async function runJob(ctx, job, claimDeviceId) {
   }, HEARTBEAT_INTERVAL_MS);
   try {
     const projectSlug = await lookupProjectSlug(ctx.supabase, job.project_id);
+    const { configPath, cleanup: cleanupFn, bearer: mcpBearer } = await writeAgentMcpConfig(
+      ctx,
+      job,
+      deviceId,
+      projectSlug,
+      {
+        repo: `${job.repo_owner}/${job.repo_name}`,
+        before_sha: job.before_sha ?? null,
+        after_sha: job.after_sha,
+        job_id: job.id,
+        // Effective run mode — always diff or pr_update now (reconcile is gone).
+        mode: job.source_mode === "pr_update" ? "pr_update" : "diff",
+        commit_message: job.commit_message ?? null,
+        committed_at: job.head_commit_timestamp ?? null,
+        author_name: job.author_name ?? null,
+        author_login: job.author_login ?? null
+      }
+    );
+    activeCleanups.add(cleanupFn);
+    cleanupFns.push(cleanupFn);
+    markPhase("job_token");
     let clone;
     try {
       clone = await ensureCloneAndFetch(ctx, job, deviceId);
@@ -18041,27 +18120,6 @@ async function runJob(ctx, job, claimDeviceId) {
         throw new Error(`failed to materialize large diff to disk (${bytes} bytes): ${e.message}`);
       }
     }
-    const mcpBearer = await ctx.auth.getMcpAccessToken();
-    const { configPath, cleanup: cleanupFn } = await writeMcpConfig({
-      baseUrl: ctx.mcpBaseUrl,
-      projectSlug,
-      branch: job.archme_branch,
-      bearer: mcpBearer,
-      source: {
-        repo: `${job.repo_owner}/${job.repo_name}`,
-        before_sha: job.before_sha ?? null,
-        after_sha: job.after_sha,
-        job_id: job.id,
-        // Effective run mode — always diff or pr_update now (reconcile is gone).
-        mode: effectiveMode,
-        commit_message: job.commit_message ?? null,
-        committed_at: job.head_commit_timestamp ?? null,
-        author_name: job.author_name ?? null,
-        author_login: job.author_login ?? null
-      }
-    });
-    activeCleanups.add(cleanupFn);
-    cleanupFns.push(cleanupFn);
     let affectedSeed = "";
     let affectedForComplete = null;
     if (diff) {
@@ -18674,7 +18732,7 @@ ${signal} received, shutting down`);
   process.on("SIGINT", () => shutdown("SIGINT"));
   process.on("SIGTERM", () => shutdown("SIGTERM"));
 }
-var HEARTBEAT_INTERVAL_MS, CLAUDE_TIMEOUT_MS, CLAUDE_LARGE_DIFF_TIMEOUT_MS, SAFETY_SWEEP_MS, LOG_STDOUT_CAP_BYTES, LOG_STDERR_CAP_BYTES, FAILURE_DETAIL_MAX, PRE_SPAWN_TOKEN_MIN_LIFETIME_MS, SUPABASE_URL, SUPABASE_ANON_KEY, ARCHME_DAEMON_CLIENT_ID, ARCHME_MCP_BASE_URL, CLONE_BASE_DIR, DAEMON_ID, LEASE_SECONDS, inFlight, cancelled, killReasons, activeCleanups, cloneMutex, shuttingDown, daemonVersion, pauseUntilMs, resumeTimer, currentSched, MAX_CONCURRENT_JOBS, ctxByJob, deviceByJob, DEFAULT_CLONE_BASE_DIR, INLINE_PATCH_BYTE_CAP, GIT_SHA_RE, CURATOR_PREAMBLE, CORE_PRINCIPLES, STORY_COVERAGE_GATE, NEW_STORY_GUIDANCE, STORY_DESCRIPTION_EDIT_RULE, PHASE_GUIDANCE, BASE_RULES, DIFF_RULES, finite, channelSeq, MultipleAccountsError, __testDispatch;
+var HEARTBEAT_INTERVAL_MS, CLAUDE_TIMEOUT_MS, CLAUDE_LARGE_DIFF_TIMEOUT_MS, SAFETY_SWEEP_MS, LOG_STDOUT_CAP_BYTES, LOG_STDERR_CAP_BYTES, FAILURE_DETAIL_MAX, PRE_SPAWN_TOKEN_MIN_LIFETIME_MS, SUPABASE_URL, SUPABASE_ANON_KEY, ARCHME_DAEMON_CLIENT_ID, ARCHME_MCP_BASE_URL, CLONE_BASE_DIR, DAEMON_ID, LEASE_SECONDS, inFlight, cancelled, killReasons, activeCleanups, cloneMutex, shuttingDown, daemonVersion, pauseUntilMs, resumeTimer, currentSched, MAX_CONCURRENT_JOBS, ctxByJob, deviceByJob, DEFAULT_CLONE_BASE_DIR, JOB_TOKEN_PREFIX, INLINE_PATCH_BYTE_CAP, GIT_SHA_RE, CURATOR_PREAMBLE, CORE_PRINCIPLES, STORY_COVERAGE_GATE, NEW_STORY_GUIDANCE, STORY_DESCRIPTION_EDIT_RULE, PHASE_GUIDANCE, BASE_RULES, DIFF_RULES, finite, channelSeq, MultipleAccountsError, __testDispatch;
 var init_run = __esm({
   "src/daemon/run.ts"() {
     "use strict";
@@ -18736,6 +18794,7 @@ var init_run = __esm({
     ctxByJob = /* @__PURE__ */ new Map();
     deviceByJob = /* @__PURE__ */ new Map();
     DEFAULT_CLONE_BASE_DIR = `${homedir6()}/.archme-job-runner/clones`;
+    JOB_TOKEN_PREFIX = "amj_";
     INLINE_PATCH_BYTE_CAP = 2e5;
     GIT_SHA_RE = /^[0-9a-f]{40}$/;
     CURATOR_PREAMBLE = `## Your role
@@ -18864,6 +18923,11 @@ ${ANCHOR_VERIFICATION}`;
         return deviceByJob.get(jobId);
       },
       runJob,
+      // R7: the job-bound `amj_` MCP token mint and the digest's MCP setup, so a
+      // test can assert the agent's mcp.json carries the job token and never the
+      // daemon's own session.
+      mintJobToken,
+      setupDigestMcp,
       // Exposes the clone/fetch entrypoint so a test can assert that the repo-token
       // mint (getRepoCredentials -> agents-device/repo-token, gated on
       // claimed_by_device_id) uses the CLAIM-time device rather than recomputing via

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archme/cli",
-  "version": "0.8.2",
+  "version": "0.9.1",
   "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",