@appchy/jarvis 0.1.23 → 0.1.25

package/dist/bin.js

@@ -886,6 +886,20 @@ var init_anthropic_llm_provider = __esm({
 });
 
 // ../../providers/anthropic/src/claude-code.llm.provider.ts
+function isRateLimitError(err) {
+  if (!err) return { matched: false };
+  const e = err;
+  const msg = typeof e.message === "string" ? e.message : "";
+  const name = typeof e.name === "string" ? e.name : "";
+  const status = typeof e.status === "number" ? e.status : void 0;
+  const matched = status === 429 || /rate.?limit/i.test(msg) || /rate.?limit/i.test(name);
+  if (!matched) return { matched: false };
+  return {
+    matched: true,
+    ...typeof e.resetsAt === "string" ? { resetsAt: e.resetsAt } : {},
+    ...typeof e.tier === "string" ? { tier: e.tier } : {}
+  };
+}
 function generateId() {
   return `pui-${Date.now()}-${++_idCounter}`;
 }
@@ -1063,6 +1077,9 @@ async function processAfterHooks(ctx, req) {
 }
 function claudeCodeProvider(config = {}) {
   const useSubscription = config.useSubscription ?? false;
+  if (useSubscription && process.env.ANTHROPIC_API_KEY) {
+    delete process.env.ANTHROPIC_API_KEY;
+  }
   const apiKey = useSubscription ? void 0 : config.apiKey ?? process.env.ANTHROPIC_API_KEY;
   async function query(ctx, req, _options) {
     const { query: claudeQuery } = await import("@anthropic-ai/claude-agent-sdk");
@@ -1080,6 +1097,7 @@ function claudeCodeProvider(config = {}) {
     let lastAssistantContent = "";
     let json;
     let sdkError;
+    let rateLimit;
     let inputTokens = 0;
     let outputTokens = 0;
     const isResuming = !!config.session?.resume;
@@ -1190,6 +1208,13 @@ function claudeCodeProvider(config = {}) {
             }
           }
         }
+        if (message.type === "rate_limit_event") {
+          const ev = message;
+          const resetsAt = ev.resetsAt ?? ev.resets_at ?? (typeof ev.resetTime === "number" ? new Date(ev.resetTime).toISOString() : void 0);
+          const tier = ev.tier ?? ev.scope;
+          rateLimit = { ...resetsAt ? { resetsAt } : {}, ...tier ? { tier } : {} };
+          logger.info(ctx, "[ClaudeCode] rate_limit_event (soft warning)", { resetsAt, tier });
+        }
         if (message.type === "result") {
           const subtype = message.subtype;
           if (subtype && subtype !== "success") {
@@ -1211,20 +1236,35 @@ function claudeCodeProvider(config = {}) {
         }
       }
     } catch (error) {
-      logger.error(ctx, "[ClaudeCode] Query error", {
-        error: error instanceof Error ? error.message : String(error),
-        model: req.model,
-        apiKeyPresent: !!apiKey,
-        cwd: config.workingDirectory,
-        mcpServers: Object.keys(config.mcpServers || {})
-      });
-      throw error;
+      const rl = isRateLimitError(error);
+      if (rl.matched) {
+        sdkError = "rate_limit";
+        rateLimit = {
+          ...rl.resetsAt ? { resetsAt: rl.resetsAt } : rateLimit?.resetsAt ? { resetsAt: rateLimit.resetsAt } : {},
+          ...rl.tier ? { tier: rl.tier } : rateLimit?.tier ? { tier: rateLimit.tier } : {}
+        };
+        logger.warn(ctx, "[ClaudeCode] Query throttled (hard rate limit)", {
+          model: req.model,
+          resetsAt: rl.resetsAt,
+          tier: rl.tier
+        });
+      } else {
+        logger.error(ctx, "[ClaudeCode] Query error", {
+          error: error instanceof Error ? error.message : String(error),
+          model: req.model,
+          apiKeyPresent: !!apiKey,
+          cwd: config.workingDirectory,
+          mcpServers: Object.keys(config.mcpServers || {})
+        });
+        throw error;
+      }
     }
     logger.info(ctx, "[ClaudeCode] Query complete", { messageCount });
     return {
       content: lastAssistantContent || aggregatedContent,
       json,
       error: sdkError,
+      ...rateLimit ? { rateLimit } : {},
       toolCalls: void 0,
       metadata: {
         model: req.model,
@@ -1271,6 +1311,7 @@ function claudeCodeProvider(config = {}) {
       mcpServers: Object.keys(config.mcpServers || {})
     });
     let messageCount = 0;
+    let streamRateLimit;
     try {
       for await (const message of claudeQuery({
         prompt: typeof prompt2 === "string" ? prompt2 : JSON.stringify(prompt2),
@@ -1365,6 +1406,13 @@ function claudeCodeProvider(config = {}) {
             }
           }
         }
+        if (message.type === "rate_limit_event") {
+          const ev = message;
+          const resetsAt = ev.resetsAt ?? ev.resets_at ?? (typeof ev.resetTime === "number" ? new Date(ev.resetTime).toISOString() : void 0);
+          const tier = ev.tier ?? ev.scope;
+          streamRateLimit = { ...resetsAt ? { resetsAt } : {}, ...tier ? { tier } : {} };
+          logger.info(ctx, "[ClaudeCode] rate_limit_event (soft warning)", { resetsAt, tier });
+        }
         if (message.type === "result") {
           if ("usage" in message) {
             const usage = message.usage;
@@ -1377,6 +1425,7 @@ function claudeCodeProvider(config = {}) {
             content: "",
             // Text already yielded incrementally
             json: sc,
+            ...streamRateLimit ? { rateLimit: streamRateLimit } : {},
             metadata: {
               model: req.model,
               usage: {
@@ -1391,6 +1440,33 @@ function claudeCodeProvider(config = {}) {
         }
       }
     } catch (error) {
+      const rl = isRateLimitError(error);
+      if (rl.matched) {
+        const merged = {
+          ...rl.resetsAt ? { resetsAt: rl.resetsAt } : streamRateLimit?.resetsAt ? { resetsAt: streamRateLimit.resetsAt } : {},
+          ...rl.tier ? { tier: rl.tier } : streamRateLimit?.tier ? { tier: streamRateLimit.tier } : {}
+        };
+        logger.warn(ctx, "[ClaudeCode] Stream throttled (hard rate limit)", {
+          model: req.model,
+          ...merged
+        });
+        yield {
+          content: "",
+          error: "rate_limit",
+          rateLimit: merged,
+          metadata: {
+            model: req.model,
+            usage: {
+              inputTokens,
+              outputTokens,
+              totalTokens: inputTokens + outputTokens
+            },
+            duration: Date.now() - startTime,
+            provider: "claude-code"
+          }
+        };
+        return;
+      }
       logger.error(ctx, "[ClaudeCode] Stream error", {
         error: error instanceof Error ? error.message : String(error),
         model: req.model,
@@ -4358,6 +4434,9 @@ function computeCost(model, usage) {
   return input + output + read2 + write;
 }
 function claudeCodeAgent(config = {}) {
+  if (config.useSubscription && process.env.ANTHROPIC_API_KEY) {
+    delete process.env.ANTHROPIC_API_KEY;
+  }
   const activeRuns = /* @__PURE__ */ new Map();
   return {
     id: "claude-code",
@@ -4438,13 +4517,20 @@ ${orig.content ?? ""}`
           runId,
           success: !response.error && !aborted
         });
+        const isRateLimit = response.error === "rate_limit";
         return {
           message: response.content ?? "",
           success: !response.error && !aborted,
           cancelled: aborted,
           state: req.state ?? {},
           metadata: { inputTokens: 0, outputTokens: 0, totalTokens: 0, iterations: 0 },
-          ...response.error ? { exit: { reason: "error", message: response.error } } : {}
+          ...isRateLimit ? {
+            exit: {
+              reason: "rate_limit",
+              message: "Rate limited \u2014 try again in a moment.",
+              ...response.rateLimit?.resetsAt ? { resetsAt: response.rateLimit.resetsAt } : {}
+            }
+          } : response.error ? { exit: { reason: "error", message: response.error } } : {}
         };
       } catch (err) {
         const aborted = abortController.signal.aborted;
@@ -4460,6 +4546,26 @@ ${orig.content ?? ""}`
           };
         }
         const message = err instanceof Error ? err.message : String(err);
+        const e = err;
+        const status = typeof e.status === "number" ? e.status : void 0;
+        const name = typeof e.name === "string" ? e.name : "";
+        const isRateLimit = status === 429 || /rate.?limit/i.test(message) || /rate.?limit/i.test(name);
+        if (isRateLimit) {
+          const resetsAt = typeof e.resetsAt === "string" ? e.resetsAt : void 0;
+          logger.warn(ctx, "[claude-code] Throttled", { runId, resetsAt });
+          return {
+            message: "",
+            success: false,
+            cancelled: false,
+            state: req.state ?? {},
+            metadata: { inputTokens: 0, outputTokens: 0, totalTokens: 0, iterations: 0 },
+            exit: {
+              reason: "rate_limit",
+              message: "Rate limited \u2014 try again in a moment.",
+              ...resetsAt ? { resetsAt } : {}
+            }
+          };
+        }
         logger.error(ctx, "[claude-code] Failed", { runId, error: message });
         return {
           message: "",
@@ -5288,9 +5394,9 @@ function getWorkspacePath() {
 var provider2 = null;
 var pendingInputs = /* @__PURE__ */ new Map();
 function initAgent(c) {
+  const useSubscription = c.useSubscription ?? !c.anthropicApiKey;
   provider2 = claudeCodeAgent({
-    apiKey: c.anthropicApiKey,
-    useSubscription: c.useSubscription,
+    ...useSubscription ? { useSubscription: true } : { apiKey: c.anthropicApiKey },
     userId: c.userId,
     appUrl: c.appUrl,
     defaultWorkspace: getWorkspacePath()
@@ -5334,6 +5440,13 @@ async function runTask(ctx, req) {
         content: result.message,
         error: result.exit?.message,
         interrupted: result.cancelled,
+        ...result.exit ? {
+          exit: {
+            reason: result.exit.reason,
+            message: result.exit.message,
+            ...result.exit.resetsAt ? { resetsAt: result.exit.resetsAt } : {}
+          }
+        } : {},
         ...result.sessionId ? { sessionId: result.sessionId } : {}
       }
     });
@@ -5534,7 +5647,7 @@ function codeAgents(config) {
 
 // src/chats.ts
 init_src6();
-var claudeCode = claudeCodeAgent();
+var claudeCode = claudeCodeAgent({ useSubscription: true });
 var agentProvider = agents({ providers: [claudeCode] });
 var codeAgentProvider = codeAgents({ providers: [claudeCode] });
 
@@ -6967,7 +7080,7 @@ function register6(program) {
         console.log(`  Connected:  ${config.connectedAt}`);
       }
     } else {
-      console.log(`  Config:     Not set up. Run 'jarvis connect <token>'`);
+      console.log(`  Config:     Not set up. Run 'jarvis start'`);
     }
     const svc = createServiceManager();
     const svcStatus = svc.status();