@inetafrica/open-claudia 1.14.0 → 1.14.2

package/bot-agent.js

@@ -830,6 +830,79 @@ function preflightClaudeAuthMessage() {
 }
 
 
+function isClaudeUsageLimitText(text) {
+  const lower = String(text || "").toLowerCase();
+  return lower.includes("usage limit") ||
+    lower.includes("you've hit your usage limit") ||
+    lower.includes("you have hit your usage limit") ||
+    lower.includes("spend limit") ||
+    lower.includes("monthly cycle") ||
+    lower.includes("rate limit") && lower.includes("model");
+}
+
+function claudeUsageLimitMessage(details = "") {
+  return [
+    "Claude ran, but the selected model is unavailable/limited right now.",
+    details ? `\nDetails:\n${redactSensitive(details)}` : "",
+    "",
+    "Try from Telegram:",
+    "1. /model sonnet",
+    "2. Then send your message again",
+    "",
+    "If you specifically need Opus, wait for the usage window to reset or increase the spend/usage limit."
+  ].filter(Boolean).join("\n");
+}
+
+function runClaudeAuthStatusDiagnostic() {
+  try {
+    const output = execSync(`"${CLAUDE_PATH}" auth status`, {
+      cwd: process.env.HOME || require("os").homedir(),
+      env: claudeSubprocessEnv(),
+      encoding: "utf8",
+      timeout: 10000,
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    return output.trim();
+  } catch (e) {
+    return `${e.stdout || ""}\n${e.stderr || ""}\n${e.message || ""}`.trim();
+  }
+}
+
+
+async function sendClaudeAuthStatusSummary(prefix = "Claude auth status") {
+  const output = runClaudeAuthStatusDiagnostic();
+  const tokenInfo = getClaudeOAuthToken();
+  const lines = summarizeClaudeAuthStatus(output, isClaudeAuthErrorText(output) ? 1 : 0, tokenInfo);
+  await send([
+    prefix,
+    "",
+    ...lines,
+    `Bot OAuth token: ${tokenInfo.value ? "configured via " + tokenInfo.source : "not configured"}`,
+  ].join("\n"));
+}
+
+function claudeEmptyFailureMessage(code, stderrText = "") {
+  const stderr = redactSensitive(String(stderrText || "").trim());
+  if (isClaudeUsageLimitText(stderr)) return claudeUsageLimitMessage(stderr.slice(-1200));
+  if (isClaudeAuthErrorText(stderr)) return claudeAuthRecoveryMessage(stderr.slice(-1200));
+
+  const authStatus = runClaudeAuthStatusDiagnostic();
+  if (isClaudeAuthErrorText(authStatus)) return claudeAuthRecoveryMessage(authStatus.slice(-1200));
+  if (isClaudeUsageLimitText(authStatus)) return claudeUsageLimitMessage(authStatus.slice(-1200));
+
+  return [
+    `Claude exited with code ${code} but produced no assistant output.`,
+    stderr ? `\nStderr:\n${stderr.slice(-1200)}` : "\nStderr: (empty)",
+    authStatus ? `\nAuth status:\n${redactSensitive(authStatus).slice(-1200)}` : "",
+    "",
+    "Useful next steps:",
+    "• /auth_status — verify Claude auth",
+    "• /model sonnet — switch away from Opus if usage-limited",
+    "• /setup_token — create a launchd-safe OAuth token if Keychain is the issue"
+  ].filter(Boolean).join("\n");
+}
+
+
 function summarizeClaudeAuthStatus(output, exitCode, tokenInfo) {
   const text = String(output || "");
   const lower = text.toLowerCase();
@@ -895,9 +968,16 @@ async function runClaudeAuthCommand(args, label, opts = {}) {
     const token = opts.captureToken ? extractClaudeToken(output) : null;
     if (token && !tokenStored) tokenStored = saveClaudeOAuthToken(token);
     const final = redactSensitive(output.trim());
-    if (tokenStored) await send(`${label} finished. OAuth token stored for launchd/non-interactive Claude runs.`);
-    else if (final) await send(`${label} finished (exit ${code}).\n\n${final.slice(-2500)}`);
-    else await send(`${label} finished (exit ${code}).`);
+    if (tokenStored) {
+      await send(`${label} finished. OAuth token stored for launchd/non-interactive Claude runs.`);
+      await sendClaudeAuthStatusSummary("Post-auth check:");
+    } else if (final) {
+      await send(`${label} finished (exit ${code}).\n\n${final.slice(-2500)}`);
+      await sendClaudeAuthStatusSummary("Post-auth check:");
+    } else {
+      await send(`${label} finished (exit ${code}).`);
+      await sendClaudeAuthStatusSummary("Post-auth check:");
+    }
   });
   proc.on("error", async (err) => {
     pendingClaudeAuthProcess = null;
@@ -1172,6 +1252,11 @@ async function runClaude(prompt, cwd, replyToMsgId, opts = {}) {
       return;
     }
     try {
+      if (code !== 0 && code !== null && !assistantText.trim()) {
+        await send(claudeEmptyFailureMessage(code, stderrBuffer), { replyTo: replyToMsgId });
+        return;
+      }
+
       const finalText = redactSensitive(assistantText || "(no output)");
       const chunks = splitMessage(finalText);
       const firstChunk = chunks[0];
@@ -1629,6 +1714,7 @@ bot.onText(/\/use_oauth_token(?:\s+(.+))?$/, async (msg, match) => {
   if (!looksLikeClaudeToken(token)) return send("That doesn't look like a Claude OAuth token. Not saved.");
   saveClaudeOAuthToken(token);
   await send(`Claude OAuth token stored in .env${vault.isUnlocked() ? " and vault" : ""}. Restart the bot so launchd picks it up, or use /restart.`);
+  await sendClaudeAuthStatusSummary("Stored token. Current Claude auth status:");
 });
 
 bot.onText(/\/clear_oauth_token$/, async (msg) => {
@@ -1883,11 +1969,12 @@ bot.on("message", async (msg) => {
       if (!looksLikeClaudeToken(text)) { await send("That doesn't look like a Claude OAuth token. Not saved."); return; }
       saveClaudeOAuthToken(text);
       await send(`Claude OAuth token stored in .env${vault.isUnlocked() ? " and vault" : ""}. Restart the bot so launchd picks it up, or use /restart.`);
+  await sendClaudeAuthStatusSummary("Stored token. Current Claude auth status:");
       return;
     }
     try {
       pendingClaudeAuthProcess.stdin.write(text + "\n");
-      await send("Sent to Claude auth process.");
+      await send("Sent to Claude auth process. I’ll confirm when Claude finishes the auth check.");
     } catch (e) {
       pendingClaudeAuthProcess = null;
       pendingClaudeAuthLabel = null;

package/bot.js

@@ -892,6 +892,79 @@ function preflightClaudeAuthMessage() {
 }
 
 
+function isClaudeUsageLimitText(text) {
+  const lower = String(text || "").toLowerCase();
+  return lower.includes("usage limit") ||
+    lower.includes("you've hit your usage limit") ||
+    lower.includes("you have hit your usage limit") ||
+    lower.includes("spend limit") ||
+    lower.includes("monthly cycle") ||
+    lower.includes("rate limit") && lower.includes("model");
+}
+
+function claudeUsageLimitMessage(details = "") {
+  return [
+    "Claude ran, but the selected model is unavailable/limited right now.",
+    details ? `\nDetails:\n${redactSensitive(details)}` : "",
+    "",
+    "Try from Telegram:",
+    "1. /model sonnet",
+    "2. Then send your message again",
+    "",
+    "If you specifically need Opus, wait for the usage window to reset or increase the spend/usage limit."
+  ].filter(Boolean).join("\n");
+}
+
+function runClaudeAuthStatusDiagnostic() {
+  try {
+    const output = execSync(`"${CLAUDE_PATH}" auth status`, {
+      cwd: process.env.HOME || require("os").homedir(),
+      env: claudeSubprocessEnv(),
+      encoding: "utf8",
+      timeout: 10000,
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    return output.trim();
+  } catch (e) {
+    return `${e.stdout || ""}\n${e.stderr || ""}\n${e.message || ""}`.trim();
+  }
+}
+
+
+async function sendClaudeAuthStatusSummary(prefix = "Claude auth status") {
+  const output = runClaudeAuthStatusDiagnostic();
+  const tokenInfo = getClaudeOAuthToken();
+  const lines = summarizeClaudeAuthStatus(output, isClaudeAuthErrorText(output) ? 1 : 0, tokenInfo);
+  await send([
+    prefix,
+    "",
+    ...lines,
+    `Bot OAuth token: ${tokenInfo.value ? "configured via " + tokenInfo.source : "not configured"}`,
+  ].join("\n"));
+}
+
+function claudeEmptyFailureMessage(code, stderrText = "") {
+  const stderr = redactSensitive(String(stderrText || "").trim());
+  if (isClaudeUsageLimitText(stderr)) return claudeUsageLimitMessage(stderr.slice(-1200));
+  if (isClaudeAuthErrorText(stderr)) return claudeAuthRecoveryMessage(stderr.slice(-1200));
+
+  const authStatus = runClaudeAuthStatusDiagnostic();
+  if (isClaudeAuthErrorText(authStatus)) return claudeAuthRecoveryMessage(authStatus.slice(-1200));
+  if (isClaudeUsageLimitText(authStatus)) return claudeUsageLimitMessage(authStatus.slice(-1200));
+
+  return [
+    `Claude exited with code ${code} but produced no assistant output.`,
+    stderr ? `\nStderr:\n${stderr.slice(-1200)}` : "\nStderr: (empty)",
+    authStatus ? `\nAuth status:\n${redactSensitive(authStatus).slice(-1200)}` : "",
+    "",
+    "Useful next steps:",
+    "• /auth_status — verify Claude auth",
+    "• /model sonnet — switch away from Opus if usage-limited",
+    "• /setup_token — create a launchd-safe OAuth token if Keychain is the issue"
+  ].filter(Boolean).join("\n");
+}
+
+
 function summarizeClaudeAuthStatus(output, exitCode, tokenInfo) {
   const text = String(output || "");
   const lower = text.toLowerCase();
@@ -957,9 +1030,16 @@ async function runClaudeAuthCommand(args, label, opts = {}) {
     const token = opts.captureToken ? extractClaudeToken(output) : null;
     if (token && !tokenStored) tokenStored = saveClaudeOAuthToken(token);
     const final = redactSensitive(output.trim());
-    if (tokenStored) await send(`${label} finished. OAuth token stored for launchd/non-interactive Claude runs.`);
-    else if (final) await send(`${label} finished (exit ${code}).\n\n${final.slice(-2500)}`);
-    else await send(`${label} finished (exit ${code}).`);
+    if (tokenStored) {
+      await send(`${label} finished. OAuth token stored for launchd/non-interactive Claude runs.`);
+      await sendClaudeAuthStatusSummary("Post-auth check:");
+    } else if (final) {
+      await send(`${label} finished (exit ${code}).\n\n${final.slice(-2500)}`);
+      await sendClaudeAuthStatusSummary("Post-auth check:");
+    } else {
+      await send(`${label} finished (exit ${code}).`);
+      await sendClaudeAuthStatusSummary("Post-auth check:");
+    }
   });
   proc.on("error", async (err) => {
     pendingClaudeAuthProcess = null;
@@ -1193,6 +1273,11 @@ async function runClaude(prompt, cwd, replyToMsgId, opts = {}) {
     }
 
     try {
+      if (code !== 0 && code !== null && !assistantText.trim()) {
+        await send(claudeEmptyFailureMessage(code, stderrBuffer), { replyTo: replyToMsgId });
+        return;
+      }
+
       const finalText = redactSensitive(assistantText || "(no output)");
       const chunks = splitMessage(finalText);
       const firstChunk = chunks[0];
@@ -1660,6 +1745,7 @@ bot.onText(/\/use_oauth_token(?:\s+(.+))?$/, async (msg, match) => {
   if (!looksLikeClaudeToken(token)) return send("That doesn't look like a Claude OAuth token. Not saved.");
   saveClaudeOAuthToken(token);
   await send(`Claude OAuth token stored in .env${vault.isUnlocked() ? " and vault" : ""}. Restart the bot so launchd picks it up, or use /restart.`);
+  await sendClaudeAuthStatusSummary("Stored token. Current Claude auth status:");
 });
 
 bot.onText(/\/clear_oauth_token$/, async (msg) => {
@@ -1922,11 +2008,12 @@ bot.on("message", async (msg) => {
       if (!looksLikeClaudeToken(text)) { await send("That doesn't look like a Claude OAuth token. Not saved."); return; }
       saveClaudeOAuthToken(text);
       await send(`Claude OAuth token stored in .env${vault.isUnlocked() ? " and vault" : ""}. Restart the bot so launchd picks it up, or use /restart.`);
+  await sendClaudeAuthStatusSummary("Stored token. Current Claude auth status:");
       return;
     }
     try {
       pendingClaudeAuthProcess.stdin.write(text + "\n");
-      await send("Sent to Claude auth process.");
+      await send("Sent to Claude auth process. I’ll confirm when Claude finishes the auth check.");
     } catch (e) {
       pendingClaudeAuthProcess = null;
       pendingClaudeAuthLabel = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inetafrica/open-claudia",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "description": "Your always-on AI coding assistant — Claude Code via Telegram",
   "main": "bot.js",
   "bin": {