Merge branch 'main' into commands-list-clean

src/auto-reply/reply/agent-runner.claude-cli.test.ts

@@ -1,8 +1,7 @@
 import crypto from "node:crypto";
 import { describe, expect, it, vi } from "vitest";
-
-import type { TemplateContext } from "../templating.js";
 import { onAgentEvent } from "../../infra/agent-events.js";
+import type { TemplateContext } from "../templating.js";
 import type { FollowupRun, QueueSettings } from "./queue.js";
 import { createMockTypingController } from "./test-helpers.js";
 
@@ -105,9 +104,7 @@ function createRun() {
 
 describe("runReplyAgent claude-cli routing", () => {
   it("uses claude-cli runner for claude-cli provider", async () => {
-    const randomSpy = vi
-      .spyOn(crypto, "randomUUID")
-      .mockReturnValue("run-1");
+    const randomSpy = vi.spyOn(crypto, "randomUUID").mockReturnValue("run-1");
     const lifecyclePhases: string[] = [];
     const unsubscribe = onAgentEvent((evt) => {
       if (evt.runId !== "run-1") return;

src/auto-reply/reply/agent-runner.ts

@@ -18,7 +18,10 @@ import {
 } from "../../config/sessions.js";
 import type { TypingMode } from "../../config/types.js";
 import { logVerbose } from "../../globals.js";
-import { emitAgentEvent, registerAgentRunContext } from "../../infra/agent-events.js";
+import {
+  emitAgentEvent,
+  registerAgentRunContext,
+} from "../../infra/agent-events.js";
 import { defaultRuntime } from "../../runtime.js";
 import {
   estimateUsageCost,
@@ -352,7 +355,7 @@ export async function runReplyAgent(params: {
               runId,
               extraSystemPrompt: followupRun.run.extraSystemPrompt,
               ownerNumbers: followupRun.run.ownerNumbers,
-              resumeSessionId:
+              claudeSessionId:
                 sessionEntry?.claudeCliSessionId?.trim() || undefined,
             })
               .then((result) => {

src/auto-reply/reply/commands.ts

@@ -220,16 +220,13 @@ function resolveModelAuthLabel(
   const providerKey = normalizeProviderId(resolved);
   const store = ensureAuthProfileStore();
   const profileOverride = sessionEntry?.authProfileOverride?.trim();
-  const lastGood = store.lastGood?.[providerKey] ?? store.lastGood?.[resolved];
   const order = resolveAuthProfileOrder({
     cfg,
     store,
     provider: providerKey,
     preferredProfile: profileOverride,
   });
-  const candidates = [profileOverride, lastGood, ...order].filter(
-    Boolean,
-  ) as string[];
+  const candidates = [profileOverride, ...order].filter(Boolean) as string[];
 
   for (const profileId of candidates) {
     const profile = store.profiles[profileId];
@@ -240,6 +237,10 @@ function resolveModelAuthLabel(
     if (profile.type === "oauth") {
       return `oauth${label ? ` (${label})` : ""}`;
     }
+    if (profile.type === "token") {
+      const snippet = formatApiKeySnippet(profile.token);
+      return `token ${snippet}${label ? ` (${label})` : ""}`;
+    }
     const snippet = formatApiKeySnippet(profile.key);
     return `api-key ${snippet}${label ? ` (${label})` : ""}`;
   }
@@ -508,6 +509,14 @@ export async function handleCommands(params: {
       );
       return { shouldContinue: false };
     }
+    if (cfg.commands?.restart !== true) {
+      return {
+        shouldContinue: false,
+        reply: {
+          text: "⚠️ /restart is disabled. Set commands.restart=true to enable.",
+        },
+      };
+    }
     const hasSigusr1Listener = process.listenerCount("SIGUSR1") > 0;
     if (hasSigusr1Listener) {
       scheduleGatewaySigusr1Restart({ reason: "/restart" });

src/auto-reply/reply/directive-handling.ts

@@ -88,13 +88,18 @@ const resolveAuthLabel = async (
         !profile ||
         (configProfile?.provider &&
           configProfile.provider !== profile.provider) ||
-        (configProfile?.mode && configProfile.mode !== profile.type)
+        (configProfile?.mode &&
+          configProfile.mode !== profile.type &&
+          !(configProfile.mode === "oauth" && profile.type === "token"))
       ) {
         return `${profileId}=missing`;
       }
       if (profile.type === "api_key") {
         return `${profileId}=${maskApiKey(profile.key)}`;
       }
+      if (profile.type === "token") {
+        return `${profileId}=token:${maskApiKey(profile.token)}`;
+      }
       const display = resolveAuthProfileDisplayLabel({
         cfg,
         store,