@link-assistant/hive-mind 1.0.5 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,83 @@
 # @link-assistant/hive-mind
 
+## 1.2.0
+
+### Minor Changes
+
+- Add experimental --execute-tool-with-bun option to improve speed and memory usage
+
+  This feature adds the `--execute-tool-with-bun` option that allows users to execute the AI tool using `bunx claude` instead of `claude`, which may provide performance benefits in terms of speed and memory usage.
+
+  **Supported commands:**
+  - `solve` - Uses `bunx claude` when option is enabled
+  - `task` - Uses `bunx claude` when option is enabled
+  - `review` - Uses `bunx claude` when option is enabled
+  - `hive` - Passes the option through to the `solve` subprocess
+
+  **How It Works:**
+  When `--execute-tool-with-bun` is enabled, the `claudePath` variable is set to `'bunx claude'` instead of `'claude'` (or `CLAUDE_PATH` environment variable).
+
+  **Usage Examples:**
+
+  ```bash
+  # Use with solve command
+  solve https://github.com/owner/repo/issues/123 --execute-tool-with-bun
+
+  # Use with task command
+  task "implement feature X" --execute-tool-with-bun
+
+  # Use with review command
+  review https://github.com/owner/repo/pull/456 --execute-tool-with-bun
+
+  # Use with hive command (passes through to solve)
+  hive https://github.com/owner/repo --execute-tool-with-bun
+  ```
+
+  The option defaults to `false` to maintain backward compatibility.
+
+  Fixes #812
+
+  feat(hive): recheck issue conditions before processing queue items
+
+  Added `recheckIssueConditions()` function to validate issue state right before processing,
+  preventing wasted resources on issues that should be skipped due to changed conditions since queuing.
+
+  **Checks performed:**
+  - **Issue state**: Verifies the issue is still open
+  - **Open PRs**: Checks if issue has PRs (when `--skip-issues-with-prs` is enabled)
+  - **Repository status**: Confirms repository is not archived
+
+  **Benefits:**
+  - Prevents processing closed issues
+  - Avoids duplicate work when PRs already exist
+  - Stops work on newly archived repositories
+  - Saves AI model tokens and compute resources
+
+  **Performance impact:**
+  Minimal overhead per issue (~300-500ms for API calls), negligible compared to 5-15 minute solve time.
+
+  Fixes #810
+
+## 1.1.0
+
+### Minor Changes
+
+- 4c46685: Add --enable-workspaces option for separate workspace directories
+
+  This feature adds support for creating separate workspace directories for all AI tools (claude, opencode, codex, agent). When enabled with `--enable-workspaces`, the tool creates a structured workspace:
+  - `/tmp/hive-mind-solve-gh-{owner}/{repo}-issue-{issueNumber}-workspace-{timestamp}/repository` - for the cloned repo
+  - `/tmp/hive-mind-solve-gh-{owner}/{repo}-issue-{issueNumber}-workspace-{timestamp}/tmp` - for temp files, logs, downloads
+
+  The workspace tmp directory is passed to all tool prompts, with explicit examples for saving CI logs, diffs, and command outputs.
+
+- Add relative time display for usage limit reset messages in GitHub comments
+
+  When the AI tool hits its usage limit, GitHub comments now show the reset time in a more user-friendly format:
+  - Before: `11:00 PM`
+  - After: `in 1h 23m (11:00 PM UTC)`
+
+  This helps users in different timezones understand when the limit will reset more quickly.
+
 ## 1.0.5
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.0.5",
+  "version": "1.2.0",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/agent.lib.mjs

@@ -245,7 +245,7 @@ export const handleAgentRuntimeSwitch = async () => {
 
 // Main function to execute Agent with prompts and settings
 export const executeAgent = async params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, isContinueMode, mergeStateStatus, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv, log, formatAligned, getResourceSnapshot, agentPath = 'agent', $ } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, mergeStateStatus, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv, log, formatAligned, getResourceSnapshot, agentPath = 'agent', $ } = params;
 
   // Import prompt building functions from agent.prompts.lib.mjs
   const { buildUserPrompt, buildSystemPrompt } = await import('./agent.prompts.lib.mjs');
@@ -258,6 +258,7 @@ export const executeAgent = async params => {
     prUrl,
     branchName,
     tempDir,
+    workspaceTmpDir,
     isContinueMode,
     mergeStateStatus,
     forkedRepo,
@@ -276,6 +277,7 @@ export const executeAgent = async params => {
     prNumber,
     branchName,
     tempDir,
+    workspaceTmpDir,
     isContinueMode,
     forkedRepo,
     argv,

package/src/agent.prompts.lib.mjs

@@ -11,7 +11,7 @@ import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mj
  * @returns {string} The formatted user prompt
  */
 export const buildUserPrompt = params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, isContinueMode, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv } = params;
 
   const promptLines = [];
 
@@ -26,6 +26,11 @@ export const buildUserPrompt = params => {
   promptLines.push(`Your prepared branch: ${branchName}`);
   promptLines.push(`Your prepared working directory: ${tempDir}`);
 
+  // Workspace tmp directory for logs and temp files (when --enable-workspaces is used)
+  if (workspaceTmpDir) {
+    promptLines.push(`Your prepared tmp directory for logs and downloads: ${workspaceTmpDir}`);
+  }
+
   // PR info if available
   if (prUrl) {
     promptLines.push(`Your prepared Pull Request: ${prUrl}`);
@@ -76,7 +81,7 @@ export const buildUserPrompt = params => {
  * @returns {string} The formatted system prompt
  */
 export const buildSystemPrompt = params => {
-  const { owner, repo, issueNumber, prNumber, branchName, argv } = params;
+  const { owner, repo, issueNumber, prNumber, branchName, workspaceTmpDir, argv } = params;
 
   // Build thinking instruction based on --think level
   let thinkLine = '';
@@ -90,9 +95,42 @@ export const buildSystemPrompt = params => {
     thinkLine = `\n${thinkMessages[argv.think]}\n`;
   }
 
-  return `You are AI issue solver using @link-assistant/agent.${thinkLine}
+  // Build workspace-specific instructions and examples
+  let workspaceInstructions = '';
+  if (workspaceTmpDir) {
+    workspaceInstructions = `
+Workspace tmp directory.
+   - Use ${workspaceTmpDir} for all temporary files, logs, and downloads.
+   - When saving command output to files, save to ${workspaceTmpDir}/command-output.log.
+   - When downloading CI logs, save to ${workspaceTmpDir}/ci-logs/.
+   - When saving diffs for review, save to ${workspaceTmpDir}/diffs/.
+   - When creating debug files, save to ${workspaceTmpDir}/debug/.
+
+`;
+  }
 
-General guidelines.
+  // Build CI command examples with workspace tmp paths
+  let ciExamples = '';
+  if (workspaceTmpDir) {
+    ciExamples = `
+CI investigation with workspace tmp directory.
+   - When downloading CI run logs:
+      gh run view RUN_ID --repo ${owner}/${repo} --log > ${workspaceTmpDir}/ci-logs/run-RUN_ID.log
+   - When downloading failed job logs:
+      gh run view RUN_ID --repo ${owner}/${repo} --log-failed > ${workspaceTmpDir}/ci-logs/run-RUN_ID-failed.log
+   - When listing CI runs with details:
+      gh run list --repo ${owner}/${repo} --branch ${branchName} --limit 5 --json databaseId,conclusion,createdAt,headSha > ${workspaceTmpDir}/ci-logs/recent-runs.json
+   - When saving PR diff for review:
+      gh pr diff ${prNumber} --repo ${owner}/${repo} > ${workspaceTmpDir}/diffs/pr-${prNumber}.diff
+   - When saving command output with stderr:
+      npm test 2>&1 | tee ${workspaceTmpDir}/test-output.log
+   - When investigating issue details:
+      gh issue view ${issueNumber} --repo ${owner}/${repo} --json body,comments > ${workspaceTmpDir}/issue-${issueNumber}.json
+`;
+  }
+
+  return `You are AI issue solver using @link-assistant/agent.${thinkLine}
+${workspaceInstructions}General guidelines.
    - When you execute commands, always save their logs to files for easier reading if the output becomes large.
    - When running commands, do not set a timeout yourself — let them run as long as needed.
    - When running sudo commands (especially package installations), always run them in the background to avoid timeout issues.
@@ -185,7 +223,7 @@ GitHub CLI command patterns.
    - When adding PR comment, use gh pr comment NUMBER --body "text" --repo OWNER/REPO.
    - When adding issue comment, use gh issue comment NUMBER --body "text" --repo OWNER/REPO.
    - When viewing PR details, use gh pr view NUMBER --repo OWNER/REPO.
-   - When filtering with jq, use gh api repos/${owner}/${repo}/pulls/${prNumber}/comments --paginate --jq 'reverse | .[0:5]'.${getArchitectureCareSubPrompt(argv)}`;
+   - When filtering with jq, use gh api repos/${owner}/${repo}/pulls/${prNumber}/comments --paginate --jq 'reverse | .[0:5]'.${ciExamples}${getArchitectureCareSubPrompt(argv)}`;
 };
 
 // Export all functions as default object too

package/src/claude.lib.mjs

@@ -413,7 +413,7 @@ export const checkPlaywrightMcpAvailability = async () => {
  * @returns {Object} Result of the execution including success status and session info
  */
 export const executeClaude = async params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, isContinueMode, mergeStateStatus, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv, log, setLogFile, getLogFile, formatAligned, getResourceSnapshot, claudePath, $ } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, mergeStateStatus, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv, log, setLogFile, getLogFile, formatAligned, getResourceSnapshot, claudePath, $ } = params;
   // Import prompt building functions from claude.prompts.lib.mjs
   const { buildUserPrompt, buildSystemPrompt } = await import('./claude.prompts.lib.mjs');
   // Build the user prompt
@@ -424,6 +424,7 @@ export const executeClaude = async params => {
     prUrl,
     branchName,
     tempDir,
+    workspaceTmpDir,
     isContinueMode,
     mergeStateStatus,
     forkedRepo,
@@ -443,6 +444,7 @@ export const executeClaude = async params => {
     prUrl,
     branchName,
     tempDir,
+    workspaceTmpDir,
     isContinueMode,
     forkedRepo,
     argv,

package/src/claude.prompts.lib.mjs

@@ -11,7 +11,7 @@ import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mj
  * @returns {string} The formatted user prompt
  */
 export const buildUserPrompt = params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, isContinueMode, forkedRepo, feedbackLines, owner, repo, argv, contributingGuidelines } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, forkedRepo, feedbackLines, owner, repo, argv, contributingGuidelines } = params;
 
   const promptLines = [];
 
@@ -26,6 +26,11 @@ export const buildUserPrompt = params => {
   promptLines.push(`Your prepared branch: ${branchName}`);
   promptLines.push(`Your prepared working directory: ${tempDir}`);
 
+  // Workspace tmp directory for logs and temp files (when --enable-workspaces is used)
+  if (workspaceTmpDir) {
+    promptLines.push(`Your prepared tmp directory for logs and downloads: ${workspaceTmpDir}`);
+  }
+
   // PR info if available
   if (prUrl) {
     promptLines.push(`Your prepared Pull Request: ${prUrl}`);
@@ -82,7 +87,7 @@ export const buildUserPrompt = params => {
  * @returns {string} The formatted system prompt
  */
 export const buildSystemPrompt = params => {
-  const { owner, repo, issueNumber, prNumber, branchName, argv } = params;
+  const { owner, repo, issueNumber, prNumber, branchName, workspaceTmpDir, argv } = params;
 
   // Build thinking instruction based on --think level
   let thinkLine = '';
@@ -96,10 +101,44 @@ export const buildSystemPrompt = params => {
     thinkLine = `\n${thinkMessages[argv.think]}\n`;
   }
 
+  // Build workspace-specific instructions and examples
+  let workspaceInstructions = '';
+  if (workspaceTmpDir) {
+    workspaceInstructions = `
+Workspace tmp directory.
+   - Use ${workspaceTmpDir} for all temporary files, logs, and downloads.
+   - When saving command output to files, save to ${workspaceTmpDir}/command-output.log.
+   - When downloading CI logs, save to ${workspaceTmpDir}/ci-logs/.
+   - When saving diffs for review, save to ${workspaceTmpDir}/diffs/.
+   - When creating debug files, save to ${workspaceTmpDir}/debug/.
+
+`;
+  }
+
+  // Build CI command examples with workspace tmp paths
+  let ciExamples = '';
+  if (workspaceTmpDir) {
+    ciExamples = `
+CI investigation with workspace tmp directory.
+   - When downloading CI run logs:
+      gh run view RUN_ID --repo ${owner}/${repo} --log > ${workspaceTmpDir}/ci-logs/run-RUN_ID.log
+   - When downloading failed job logs:
+      gh run view RUN_ID --repo ${owner}/${repo} --log-failed > ${workspaceTmpDir}/ci-logs/run-RUN_ID-failed.log
+   - When listing CI runs with details:
+      gh run list --repo ${owner}/${repo} --branch ${branchName} --limit 5 --json databaseId,conclusion,createdAt,headSha > ${workspaceTmpDir}/ci-logs/recent-runs.json
+   - When saving PR diff for review:
+      gh pr diff ${prNumber} --repo ${owner}/${repo} > ${workspaceTmpDir}/diffs/pr-${prNumber}.diff
+   - When saving command output with stderr:
+      npm test 2>&1 | tee ${workspaceTmpDir}/test-output.log
+   - When investigating issue details:
+      gh issue view ${issueNumber} --repo ${owner}/${repo} --json body,comments > ${workspaceTmpDir}/issue-${issueNumber}.json
+
+`;
+  }
+
   // Use backticks for jq commands to avoid quote escaping issues
   return `You are an AI issue solver. You prefer to find the root cause of each and every issue. When you talk, you prefer to speak with facts which you have double-checked yourself or cite sources that provide evidence, like quote actual code or give references to documents or pages found on the internet. You are polite and patient, and prefer to assume good intent, trying your best to be helpful. If you are unsure or have assumptions, you prefer to test them yourself or ask questions to clarify requirements.${thinkLine}
-
-General guidelines.
+${workspaceInstructions}General guidelines.
    - When you execute commands, always save their logs to files for easier reading if the output becomes large.
    - When running commands, do not set a timeout yourself — let them run as long as needed (default timeout - 2 minutes is more than enough), and once they finish, review the logs in the file.
    - When running sudo commands (especially package installations like apt-get, yum, npm install, etc.), always run them in the background to avoid timeout issues and permission errors when the process needs to be killed. Use the run_in_background parameter or append & to the command.${
@@ -243,7 +282,7 @@ Plan sub-agent usage.
    - When using the Plan sub-agent, you can add it as the first item in your todo list.
    - When you delegate planning, use the Task tool with subagent_type="Plan" before starting implementation work.`
        : ''
-   }${getArchitectureCareSubPrompt(argv)}`;
+   }${ciExamples}${getArchitectureCareSubPrompt(argv)}`;
 };
 
 // Export all functions as default object too

package/src/codex.lib.mjs

@@ -115,7 +115,7 @@ export const handleCodexRuntimeSwitch = async () => {
 
 // Main function to execute Codex with prompts and settings
 export const executeCodex = async params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, isContinueMode, mergeStateStatus, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv, log, formatAligned, getResourceSnapshot, codexPath = 'codex', $ } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, mergeStateStatus, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv, log, formatAligned, getResourceSnapshot, codexPath = 'codex', $ } = params;
 
   // Import prompt building functions from codex.prompts.lib.mjs
   const { buildUserPrompt, buildSystemPrompt } = await import('./codex.prompts.lib.mjs');
@@ -128,6 +128,7 @@ export const executeCodex = async params => {
     prUrl,
     branchName,
     tempDir,
+    workspaceTmpDir,
     isContinueMode,
     mergeStateStatus,
     forkedRepo,
@@ -146,6 +147,7 @@ export const executeCodex = async params => {
     prNumber,
     branchName,
     tempDir,
+    workspaceTmpDir,
     isContinueMode,
     forkedRepo,
     argv,

package/src/codex.prompts.lib.mjs

@@ -11,7 +11,7 @@ import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mj
  * @returns {string} The formatted user prompt
  */
 export const buildUserPrompt = params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, isContinueMode, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv } = params;
 
   const promptLines = [];
 
@@ -26,6 +26,11 @@ export const buildUserPrompt = params => {
   promptLines.push(`Your prepared branch: ${branchName}`);
   promptLines.push(`Your prepared working directory: ${tempDir}`);
 
+  // Workspace tmp directory for logs and temp files (when --enable-workspaces is used)
+  if (workspaceTmpDir) {
+    promptLines.push(`Your prepared tmp directory for logs and downloads: ${workspaceTmpDir}`);
+  }
+
   // PR info if available
   if (prUrl) {
     promptLines.push(`Your prepared Pull Request: ${prUrl}`);
@@ -76,7 +81,7 @@ export const buildUserPrompt = params => {
  * @returns {string} The formatted system prompt
  */
 export const buildSystemPrompt = params => {
-  const { owner, repo, issueNumber, prNumber, branchName, argv } = params;
+  const { owner, repo, issueNumber, prNumber, branchName, workspaceTmpDir, argv } = params;
 
   // Build thinking instruction based on --think level
   let thinkLine = '';
@@ -90,9 +95,42 @@ export const buildSystemPrompt = params => {
     thinkLine = `\n${thinkMessages[argv.think]}\n`;
   }
 
-  return `You are AI issue solver using OpenAI Codex.${thinkLine}
+  // Build workspace-specific instructions and examples
+  let workspaceInstructions = '';
+  if (workspaceTmpDir) {
+    workspaceInstructions = `
+Workspace tmp directory.
+   - Use ${workspaceTmpDir} for all temporary files, logs, and downloads.
+   - When saving command output to files, save to ${workspaceTmpDir}/command-output.log.
+   - When downloading CI logs, save to ${workspaceTmpDir}/ci-logs/.
+   - When saving diffs for review, save to ${workspaceTmpDir}/diffs/.
+   - When creating debug files, save to ${workspaceTmpDir}/debug/.
+
+`;
+  }
 
-General guidelines.
+  // Build CI command examples with workspace tmp paths
+  let ciExamples = '';
+  if (workspaceTmpDir) {
+    ciExamples = `
+CI investigation with workspace tmp directory.
+   - When downloading CI run logs:
+      gh run view RUN_ID --repo ${owner}/${repo} --log > ${workspaceTmpDir}/ci-logs/run-RUN_ID.log
+   - When downloading failed job logs:
+      gh run view RUN_ID --repo ${owner}/${repo} --log-failed > ${workspaceTmpDir}/ci-logs/run-RUN_ID-failed.log
+   - When listing CI runs with details:
+      gh run list --repo ${owner}/${repo} --branch ${branchName} --limit 5 --json databaseId,conclusion,createdAt,headSha > ${workspaceTmpDir}/ci-logs/recent-runs.json
+   - When saving PR diff for review:
+      gh pr diff ${prNumber} --repo ${owner}/${repo} > ${workspaceTmpDir}/diffs/pr-${prNumber}.diff
+   - When saving command output with stderr:
+      npm test 2>&1 | tee ${workspaceTmpDir}/test-output.log
+   - When investigating issue details:
+      gh issue view ${issueNumber} --repo ${owner}/${repo} --json body,comments > ${workspaceTmpDir}/issue-${issueNumber}.json
+`;
+  }
+
+  return `You are AI issue solver using OpenAI Codex.${thinkLine}
+${workspaceInstructions}General guidelines.
    - When you execute commands, always save their logs to files for easier reading if the output becomes large.
    - When running commands, do not set a timeout yourself — let them run as long as needed (default timeout - 2 minutes is more than enough), and once they finish, review the logs in the file.
    - When running sudo commands (especially package installations like apt-get, yum, npm install, etc.), always run them in the background to avoid timeout issues and permission errors when the process needs to be killed. Use the run_in_background parameter or append & to the command.
@@ -193,7 +231,7 @@ GitHub CLI command patterns.
    - When adding PR comment, use gh pr comment NUMBER --body "text" --repo OWNER/REPO.
    - When adding issue comment, use gh issue comment NUMBER --body "text" --repo OWNER/REPO.
    - When viewing PR details, use gh pr view NUMBER --repo OWNER/REPO.
-   - When filtering with jq, use gh api repos/\${owner}/\${repo}/pulls/\${prNumber}/comments --paginate --jq 'reverse | .[0:5]'.${getArchitectureCareSubPrompt(argv)}`;
+   - When filtering with jq, use gh api repos/\${owner}/\${repo}/pulls/\${prNumber}/comments --paginate --jq 'reverse | .[0:5]'.${ciExamples}${getArchitectureCareSubPrompt(argv)}`;
 };
 
 // Export all functions as default object too

package/src/hive.config.lib.mjs

@@ -286,6 +286,11 @@ export const createYargsConfig = yargsInstance => {
       description: '[EXPERIMENTAL] Include guidance for managing REQUIREMENTS.md and ARCHITECTURE.md files. When enabled, agents will update these documentation files when changes affect requirements or architecture.',
       default: false,
     })
+    .option('execute-tool-with-bun', {
+      type: 'boolean',
+      description: 'Execute the AI tool using bunx (experimental, may improve speed and memory usage) - passed to solve command',
+      default: false,
+    })
     .parserConfiguration({
       'boolean-negation': true,
       'strip-dashed': false,

package/src/hive.mjs

@@ -110,6 +110,8 @@ if (isDirectExecution) {
     const { tryFetchIssuesWithGraphQL } = graphqlLib;
     const solutionDraftsLib = await import('./list-solution-drafts.lib.mjs');
     const { listSolutionDrafts } = solutionDraftsLib;
+    const recheckLib = await import('./hive.recheck.lib.mjs');
+    const { recheckIssueConditions } = recheckLib;
     const commandName = process.argv[1] ? process.argv[1].split('/').pop() : '';
     const isLocalScript = commandName.endsWith('.mjs');
     const solveCommand = isLocalScript ? './solve.mjs' : 'solve';
@@ -713,6 +715,16 @@ if (isDirectExecution) {
 
         await log(`\n👷 Worker ${workerId} processing: ${issueUrl}`);
 
+        // Recheck conditions before processing to avoid wasted work
+        const recheckResult = await recheckIssueConditions(issueUrl, argv);
+        if (!recheckResult.shouldProcess) {
+          await log(`   ⏭️  Skipping issue: ${recheckResult.reason}`);
+          issueQueue.markCompleted(issueUrl);
+          const stats = issueQueue.getStats();
+          await log(`   📊 Queue: ${stats.queued} waiting, ${stats.processing} processing, ${stats.completed} completed, ${stats.failed} failed`);
+          continue;
+        }
+
         // Track if this issue failed
         let issueFailed = false;
 
@@ -756,6 +768,7 @@ if (isDirectExecution) {
             if (argv.promptIssueReporting) args.push('--prompt-issue-reporting');
             if (argv.promptCaseStudies) args.push('--prompt-case-studies');
             if (argv.promptPlaywrightMcp !== undefined) args.push(argv.promptPlaywrightMcp ? '--prompt-playwright-mcp' : '--no-prompt-playwright-mcp');
+            if (argv.executeToolWithBun) args.push('--execute-tool-with-bun');
             // Log the actual command being executed so users can investigate/reproduce
             await log(`   📋 Command: ${solveCommand} ${args.join(' ')}`);
 

package/src/hive.recheck.lib.mjs

@@ -0,0 +1,86 @@
+#!/usr/bin/env node
+// Library for rechecking issue conditions in hive queue processing
+
+import { log, cleanErrorMessage } from './lib.mjs';
+import { batchCheckPullRequestsForIssues, batchCheckArchivedRepositories } from './github.lib.mjs';
+import { reportError } from './sentry.lib.mjs';
+
+/**
+ * Recheck conditions for an issue right before processing
+ * This ensures the issue should still be processed even if conditions changed since queuing
+ * @param {string} issueUrl - The URL of the issue to check
+ * @param {Object} argv - Command line arguments with configuration
+ * @returns {Promise<{shouldProcess: boolean, reason?: string}>}
+ */
+export async function recheckIssueConditions(issueUrl, argv) {
+  try {
+    // Extract owner, repo, and issue number from URL
+    const urlMatch = issueUrl.match(/github\.com\/([^/]+)\/([^/]+)\/issues\/(\d+)/);
+    if (!urlMatch) {
+      await log(`      ⚠️  Could not parse issue URL: ${issueUrl}`, { verbose: true });
+      return { shouldProcess: true }; // Process anyway if we can't parse
+    }
+
+    const [, owner, repo, issueNumber] = urlMatch;
+    const issueNum = parseInt(issueNumber);
+
+    await log(`      🔍 Rechecking conditions for issue #${issueNum}...`, { verbose: true });
+
+    // Check 1: Verify issue is still open
+    try {
+      const { execSync } = await import('child_process');
+      const issueState = execSync(`gh api repos/${owner}/${repo}/issues/${issueNum} --jq .state`, {
+        encoding: 'utf8',
+      }).trim();
+
+      if (issueState === 'closed') {
+        return {
+          shouldProcess: false,
+          reason: 'Issue is now closed',
+        };
+      }
+      await log(`      ✅ Issue is still open`, { verbose: true });
+    } catch (error) {
+      await log(`      ⚠️  Could not check issue state: ${cleanErrorMessage(error)}`, { verbose: true });
+      // Continue checking other conditions
+    }
+
+    // Check 2: If skipIssuesWithPrs is enabled, verify issue still has no open PRs
+    if (argv.skipIssuesWithPrs) {
+      const prResults = await batchCheckPullRequestsForIssues(owner, repo, [issueNum]);
+      const prInfo = prResults[issueNum];
+
+      if (prInfo && prInfo.openPRCount > 0) {
+        return {
+          shouldProcess: false,
+          reason: `Issue now has ${prInfo.openPRCount} open PR${prInfo.openPRCount > 1 ? 's' : ''}`,
+        };
+      }
+      await log(`      ✅ Issue still has no open PRs`, { verbose: true });
+    }
+
+    // Check 3: Verify repository is not archived
+    const archivedStatusMap = await batchCheckArchivedRepositories([{ owner, name: repo }]);
+    const repoKey = `${owner}/${repo}`;
+
+    if (archivedStatusMap[repoKey] === true) {
+      return {
+        shouldProcess: false,
+        reason: 'Repository is now archived',
+      };
+    }
+    await log(`      ✅ Repository is not archived`, { verbose: true });
+
+    await log(`      ✅ All conditions passed, proceeding with processing`, { verbose: true });
+    return { shouldProcess: true };
+  } catch (error) {
+    reportError(error, {
+      context: 'recheck_issue_conditions',
+      issueUrl,
+      operation: 'recheck_conditions',
+    });
+    await log(`      ⚠️  Error rechecking conditions: ${cleanErrorMessage(error)}`, { level: 'warning' });
+    // On error, allow processing to continue (fail open)
+    return { shouldProcess: true };
+  }
+}

package/src/opencode.lib.mjs

@@ -109,7 +109,7 @@ export const handleOpenCodeRuntimeSwitch = async () => {
 
 // Main function to execute OpenCode with prompts and settings
 export const executeOpenCode = async params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, isContinueMode, mergeStateStatus, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv, log, formatAligned, getResourceSnapshot, opencodePath = 'opencode', $ } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, mergeStateStatus, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv, log, formatAligned, getResourceSnapshot, opencodePath = 'opencode', $ } = params;
 
   // Import prompt building functions from opencode.prompts.lib.mjs
   const { buildUserPrompt, buildSystemPrompt } = await import('./opencode.prompts.lib.mjs');
@@ -122,6 +122,7 @@ export const executeOpenCode = async params => {
     prUrl,
     branchName,
     tempDir,
+    workspaceTmpDir,
     isContinueMode,
     mergeStateStatus,
     forkedRepo,
@@ -140,6 +141,7 @@ export const executeOpenCode = async params => {
     prNumber,
     branchName,
     tempDir,
+    workspaceTmpDir,
     isContinueMode,
     forkedRepo,
     argv,

package/src/opencode.prompts.lib.mjs

@@ -11,7 +11,7 @@ import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mj
  * @returns {string} The formatted user prompt
  */
 export const buildUserPrompt = params => {
-  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, isContinueMode, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv } = params;
+  const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, forkedRepo, feedbackLines, forkActionsUrl, owner, repo, argv } = params;
 
   const promptLines = [];
 
@@ -26,6 +26,11 @@ export const buildUserPrompt = params => {
   promptLines.push(`Your prepared branch: ${branchName}`);
   promptLines.push(`Your prepared working directory: ${tempDir}`);
 
+  // Workspace tmp directory for logs and temp files (when --enable-workspaces is used)
+  if (workspaceTmpDir) {
+    promptLines.push(`Your prepared tmp directory for logs and downloads: ${workspaceTmpDir}`);
+  }
+
   // PR info if available
   if (prUrl) {
     promptLines.push(`Your prepared Pull Request: ${prUrl}`);
@@ -76,7 +81,7 @@ export const buildUserPrompt = params => {
  * @returns {string} The formatted system prompt
  */
 export const buildSystemPrompt = params => {
-  const { owner, repo, issueNumber, prNumber, branchName, argv } = params;
+  const { owner, repo, issueNumber, prNumber, branchName, workspaceTmpDir, argv } = params;
 
   // Build thinking instruction based on --think level
   let thinkLine = '';
@@ -90,6 +95,41 @@ export const buildSystemPrompt = params => {
     thinkLine = `\n${thinkMessages[argv.think]}\n`;
   }
 
+  // Build workspace-specific instructions and examples
+  let workspaceInstructions = '';
+  if (workspaceTmpDir) {
+    workspaceInstructions = `
+Workspace tmp directory.
+   - Use ${workspaceTmpDir} for all temporary files, logs, and downloads.
+   - When saving command output to files, save to ${workspaceTmpDir}/command-output.log.
+   - When downloading CI logs, save to ${workspaceTmpDir}/ci-logs/.
+   - When saving diffs for review, save to ${workspaceTmpDir}/diffs/.
+   - When creating debug files, save to ${workspaceTmpDir}/debug/.
+
+`;
+  }
+
+  // Build CI command examples with workspace tmp paths
+  let ciExamples = '';
+  if (workspaceTmpDir) {
+    ciExamples = `
+CI investigation with workspace tmp directory.
+   - When downloading CI run logs:
+      gh run view RUN_ID --repo ${owner}/${repo} --log > ${workspaceTmpDir}/ci-logs/run-RUN_ID.log
+   - When downloading failed job logs:
+      gh run view RUN_ID --repo ${owner}/${repo} --log-failed > ${workspaceTmpDir}/ci-logs/run-RUN_ID-failed.log
+   - When listing CI runs with details:
+      gh run list --repo ${owner}/${repo} --branch ${branchName} --limit 5 --json databaseId,conclusion,createdAt,headSha > ${workspaceTmpDir}/ci-logs/recent-runs.json
+   - When saving PR diff for review:
+      gh pr diff ${prNumber} --repo ${owner}/${repo} > ${workspaceTmpDir}/diffs/pr-${prNumber}.diff
+   - When saving command output with stderr:
+      npm test 2>&1 | tee ${workspaceTmpDir}/test-output.log
+   - When investigating issue details:
+      gh issue view ${issueNumber} --repo ${owner}/${repo} --json body,comments > ${workspaceTmpDir}/issue-${issueNumber}.json
+
+`;
+  }
+
   return `You are AI issue solver using OpenCode.${thinkLine}
 
 General guidelines.
@@ -103,7 +143,7 @@ General guidelines.
    - When testing your assumptions, use the experiment scripts, and add it to experiments folder.
    - When your experiments can show real world use case of the software, add it to examples folder.
    - When you face something extremely hard, use divide and conquer — it always helps.
-
+${workspaceInstructions}
 Initial research.
    - When you start, make sure you create detailed plan for yourself and follow your todo list step by step, make sure that as many points from these guidelines are added to your todo list to keep track of everything that can help you solve the issue with highest possible quality.
    - When you read issue, read all details and comments thoroughly.
@@ -184,7 +224,7 @@ GitHub CLI command patterns.
    - When adding PR comment, use gh pr comment NUMBER --body "text" --repo OWNER/REPO.
    - When adding issue comment, use gh issue comment NUMBER --body "text" --repo OWNER/REPO.
    - When viewing PR details, use gh pr view NUMBER --repo OWNER/REPO.
-   - When filtering with jq, use gh api repos/${owner}/${repo}/pulls/${prNumber}/comments --paginate --jq 'reverse | .[0:5]'.${getArchitectureCareSubPrompt(argv)}`;
+   - When filtering with jq, use gh api repos/${owner}/${repo}/pulls/${prNumber}/comments --paginate --jq 'reverse | .[0:5]'.${ciExamples}${getArchitectureCareSubPrompt(argv)}`;
 };
 
 // Export all functions as default object too

package/src/review.mjs

@@ -19,14 +19,15 @@ if (earlyArgs.includes('--help') || earlyArgs.includes('-h')) {
   // Show help and exit
   console.log('Usage: review.mjs <pr-url> [options]');
   console.log('\nOptions:');
-  console.log('  --version          Show version number');
-  console.log('  --help, -h         Show help');
-  console.log('  --resume, -r       Resume from a previous session ID');
-  console.log('  --dry-run, -n      Prepare everything but do not execute Claude');
-  console.log('  --model, -m        Model to use (opus, sonnet, or full model ID) [default: opus]');
-  console.log('  --focus, -f        Focus areas for review [default: all]');
-  console.log('  --approve          If review passes, approve the PR');
-  console.log('  --verbose, -v      Enable verbose logging');
+  console.log('  --version               Show version number');
+  console.log('  --help, -h              Show help');
+  console.log('  --resume, -r            Resume from a previous session ID');
+  console.log('  --dry-run, -n           Prepare everything but do not execute Claude');
+  console.log('  --model, -m             Model to use (opus, sonnet, or full model ID) [default: opus]');
+  console.log('  --focus, -f             Focus areas for review [default: all]');
+  console.log('  --approve               If review passes, approve the PR');
+  console.log('  --verbose, -v           Enable verbose logging');
+  console.log('  --execute-tool-with-bun Execute the AI tool using bunx (experimental) [default: false]');
   process.exit(0);
 }
 
@@ -91,6 +92,11 @@ const argv = yargs()
     alias: 'v',
     default: false,
   })
+  .option('execute-tool-with-bun', {
+    type: 'boolean',
+    description: 'Execute the AI tool using bunx (experimental, may improve speed and memory usage)',
+    default: false,
+  })
   .demandCommand(1, 'The GitHub pull request URL is required')
   .parserConfiguration({
     'boolean-negation': true,
@@ -126,7 +132,9 @@ if (!prUrl.match(/^https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/\d+$/)) {
   process.exit(1);
 }
 
-const claudePath = process.env.CLAUDE_PATH || 'claude';
+// Determine claude command path based on --execute-tool-with-bun option
+// When enabled, uses 'bunx claude' which may improve speed and memory usage
+const claudePath = argv.executeToolWithBun ? 'bunx claude' : process.env.CLAUDE_PATH || 'claude';
 
 // Extract repository and PR number from URL
 const urlParts = prUrl.split('/');

package/src/solve.config.lib.mjs

@@ -253,6 +253,16 @@ export const createYargsConfig = yargsInstance => {
         choices: ['claude', 'opencode', 'codex', 'agent'],
         default: 'claude',
       })
+      .option('execute-tool-with-bun', {
+        type: 'boolean',
+        description: 'Execute the AI tool using bunx (experimental, may improve speed and memory usage)',
+        default: false,
+      })
+      .option('enable-workspaces', {
+        type: 'boolean',
+        description: 'Use separate workspace directory structure with repository/ and tmp/ folders. Works with all tools (claude, opencode, codex, agent). Experimental feature.',
+        default: false,
+      })
       .option('interactive-mode', {
         type: 'boolean',
         description: '[EXPERIMENTAL] Post Claude output as PR comments in real-time. Only supported for --tool claude.',

package/src/solve.mjs

@@ -65,6 +65,9 @@ const { executeClaude } = claudeLib;
 const githubLinking = await import('./github-linking.lib.mjs');
 const { extractLinkedIssueNumber } = githubLinking;
 
+const usageLimitLib = await import('./usage-limit.lib.mjs');
+const { formatResetTimeWithRelative } = usageLimitLib;
+
 const errorHandlers = await import('./solve.error-handlers.lib.mjs');
 const { createUncaughtExceptionHandler, createUnhandledRejectionHandler, handleMainExecutionError } = errorHandlers;
 
@@ -233,7 +236,7 @@ if (argv.verbose) {
   await log(`   Is Issue URL: ${!!isIssueUrl}`, { verbose: true });
   await log(`   Is PR URL: ${!!isPrUrl}`, { verbose: true });
 }
-const claudePath = process.env.CLAUDE_PATH || 'claude';
+const claudePath = argv.executeToolWithBun ? 'bunx claude' : process.env.CLAUDE_PATH || 'claude';
 // Note: owner, repo, and urlNumber are already extracted from validateGitHubUrl() above
 // The parseUrlComponents() call was removed as it had a bug with hash fragments (#issuecomment-xyz)
 // and the validation result already provides these values correctly parsed
@@ -508,7 +511,9 @@ if (isPrUrl) {
   await log(`📝 Issue mode: Working with issue #${issueNumber}`);
 }
 // Create or find temporary directory for cloning the repository
-const { tempDir } = await setupTempDirectory(argv);
+// Pass workspace info for --enable-workspaces mode (works with all tools)
+const workspaceInfo = argv.enableWorkspaces ? { owner, repo, issueNumber } : null;
+const { tempDir, workspaceTmpDir } = await setupTempDirectory(argv, workspaceInfo);
 // Populate cleanup context for signal handlers
 cleanupContext.tempDir = tempDir;
 cleanupContext.argv = argv;
@@ -761,6 +766,7 @@ try {
       prUrl,
       branchName,
       tempDir,
+      workspaceTmpDir,
       isContinueMode,
       mergeStateStatus,
       forkedRepo,
@@ -789,6 +795,7 @@ try {
       prUrl,
       branchName,
       tempDir,
+      workspaceTmpDir,
       isContinueMode,
       mergeStateStatus,
       forkedRepo,
@@ -817,6 +824,7 @@ try {
       prUrl,
       branchName,
       tempDir,
+      workspaceTmpDir,
       isContinueMode,
       mergeStateStatus,
       forkedRepo,
@@ -858,6 +866,7 @@ try {
       prUrl,
       branchName,
       tempDir,
+      workspaceTmpDir,
       isContinueMode,
       mergeStateStatus,
       forkedRepo,
@@ -961,7 +970,9 @@ try {
           const tool = argv.tool || 'claude';
           const resumeCmd = tool === 'claude' ? buildClaudeResumeCommand({ tempDir, sessionId, model: argv.model }) : null;
           const resumeSection = resumeCmd ? `To resume after the limit resets, use:\n\`\`\`bash\n${resumeCmd}\n\`\`\`` : `Session ID: \`${sessionId}\``;
-          const failureComment = resetTime ? `❌ **Usage Limit Reached**\n\nThe AI tool has reached its usage limit. The limit will reset at: **${resetTime}**\n\n${resumeSection}` : `❌ **Usage Limit Reached**\n\nThe AI tool has reached its usage limit. Please wait for the limit to reset.\n\n${resumeSection}`;
+          // Format the reset time with relative time if available
+          const formattedResetTime = resetTime ? formatResetTimeWithRelative(resetTime) : null;
+          const failureComment = formattedResetTime ? `❌ **Usage Limit Reached**\n\nThe AI tool has reached its usage limit. The limit will reset at: **${formattedResetTime}**\n\n${resumeSection}` : `❌ **Usage Limit Reached**\n\nThe AI tool has reached its usage limit. Please wait for the limit to reset.\n\n${resumeSection}`;
 
           const commentResult = await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${failureComment}`;
           if (commentResult.code === 0) {

package/src/solve.repository.lib.mjs

@@ -199,11 +199,35 @@ export const validateForkParent = async (forkRepo, expectedUpstream) => {
   }
 };
 
+/**
+ * Build workspace directory name according to the specification:
+ * /tmp/hive-mind-solve-gh-{owner}/{repo}-issue-{issueNumber}-workspace-{timestamp}
+ *
+ * @param {string} owner - Repository owner
+ * @param {string} repo - Repository name
+ * @param {number|string} issueNumber - Issue number
+ * @param {number} timestamp - Unix timestamp
+ * @returns {string} The workspace directory path
+ */
+export const buildWorkspacePath = (owner, repo, issueNumber, timestamp) => {
+  // Format: /tmp/hive-mind-solve-gh-{owner}/{repo}-issue-{issueNumber}-workspace-{timestamp}
+  const baseDir = path.join(os.tmpdir(), `hive-mind-solve-gh-${owner}`);
+  const workspaceDir = path.join(baseDir, `${repo}-issue-${issueNumber}-workspace-${timestamp}`);
+  return workspaceDir;
+};
+
 // Create or find temporary directory for cloning the repository
-export const setupTempDirectory = async argv => {
+// When --enable-workspaces is used, creates:
+//   {workspace}/repository - for the cloned repo
+//   {workspace}/tmp - for temp files, logs, downloads
+export const setupTempDirectory = async (argv, workspaceInfo = null) => {
   let tempDir;
+  let workspaceTmpDir = null;
   let isResuming = argv.resume;
 
+  // Check if workspace mode should be enabled (works with all tools)
+  const useWorkspaces = argv.enableWorkspaces;
+
   if (isResuming) {
     // When resuming, try to find existing directory or create a new one
     const scriptDir = path.dirname(process.argv[1]);
@@ -229,13 +253,34 @@ export const setupTempDirectory = async argv => {
       await fs.mkdir(tempDir, { recursive: true });
       await log(`Creating temporary directory for resumed session: ${tempDir}`);
     }
+  } else if (useWorkspaces && workspaceInfo) {
+    // Workspace mode: create structured workspace with repository/ and tmp/ subdirectories
+    const { owner, repo, issueNumber } = workspaceInfo;
+    const timestamp = Date.now();
+    const workspaceDir = buildWorkspacePath(owner, repo, issueNumber, timestamp);
+
+    // Create the workspace structure:
+    // {workspace}/repository - where the repo will be cloned
+    // {workspace}/tmp - for temp files, logs, command outputs
+    const repoDir = path.join(workspaceDir, 'repository');
+    workspaceTmpDir = path.join(workspaceDir, 'tmp');
+
+    await fs.mkdir(repoDir, { recursive: true });
+    await fs.mkdir(workspaceTmpDir, { recursive: true });
+
+    tempDir = repoDir;
+
+    await log(`\n${formatAligned('📂', 'Workspace mode:', 'ENABLED')}`);
+    await log(formatAligned('', 'Workspace root:', workspaceDir, 2));
+    await log(formatAligned('', 'Repository dir:', repoDir, 2));
+    await log(formatAligned('', 'Temp dir:', workspaceTmpDir, 2));
   } else {
     tempDir = path.join(os.tmpdir(), `gh-issue-solver-${Date.now()}`);
     await fs.mkdir(tempDir, { recursive: true });
     await log(`\nCreating temporary directory: ${tempDir}`);
   }
 
-  return { tempDir, isResuming };
+  return { tempDir, workspaceTmpDir, isResuming };
 };
 
 // Try to initialize an empty repository by creating a simple README.md

package/src/task.mjs

@@ -124,6 +124,11 @@ const argv = yargs()
     default: 'text',
     choices: ['text', 'json'],
   })
+  .option('execute-tool-with-bun', {
+    type: 'boolean',
+    description: 'Execute the AI tool using bunx (experimental, may improve speed and memory usage)',
+    default: false,
+  })
   .check(argv => {
     if (!argv['task-description'] && !argv._[0]) {
       throw new Error('Please provide a task description');
@@ -186,7 +191,7 @@ await log(formatAligned('💡', 'Clarify mode:', argv.clarify ? 'enabled' : 'dis
 await log(formatAligned('🔍', 'Decompose mode:', argv.decompose ? 'enabled' : 'disabled'));
 await log(formatAligned('📄', 'Output format:', argv.outputFormat));
 
-const claudePath = process.env.CLAUDE_PATH || 'claude';
+const claudePath = argv.executeToolWithBun ? 'bunx claude' : process.env.CLAUDE_PATH || 'claude';
 
 // Helper function to execute Claude command
 const executeClaude = (prompt, model) => {

package/src/usage-limit.lib.mjs

@@ -142,6 +142,111 @@ export function detectUsageLimit(message) {
   };
 }
 
+/**
+ * Parse time string (e.g., "11:00 PM") and convert to Date object for today
+ *
+ * @param {string} timeStr - Time string in format "HH:MM AM/PM"
+ * @returns {Date|null} - Date object or null if parsing fails
+ */
+export function parseResetTime(timeStr) {
+  if (!timeStr || typeof timeStr !== 'string') {
+    return null;
+  }
+
+  // Match pattern like "11:00 PM" or "11:00PM"
+  const match = timeStr.match(/(\d{1,2}):(\d{2})\s*(AM|PM)/i);
+  if (!match) {
+    return null;
+  }
+
+  let hour = parseInt(match[1], 10);
+  const minute = parseInt(match[2], 10);
+  const ampm = match[3].toUpperCase();
+
+  // Convert to 24-hour format
+  if (ampm === 'PM' && hour !== 12) {
+    hour += 12;
+  } else if (ampm === 'AM' && hour === 12) {
+    hour = 0;
+  }
+
+  // Create date for today with the parsed time
+  const now = new Date();
+  const resetDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), hour, minute, 0, 0);
+
+  // If the time is in the past today, assume it's tomorrow
+  if (resetDate <= now) {
+    resetDate.setDate(resetDate.getDate() + 1);
+  }
+
+  return resetDate;
+}
+
+/**
+ * Format relative time (e.g., "in 1h 23m")
+ *
+ * @param {Date} resetDate - Date object for reset time
+ * @returns {string} - Formatted relative time string
+ */
+export function formatRelativeTime(resetDate) {
+  if (!resetDate || !(resetDate instanceof Date)) {
+    return '';
+  }
+
+  const now = new Date();
+  const diffMs = resetDate - now;
+
+  if (diffMs <= 0) {
+    return 'now';
+  }
+
+  const totalSeconds = Math.floor(diffMs / 1000);
+  const totalMinutes = Math.floor(totalSeconds / 60);
+  const totalHours = Math.floor(totalMinutes / 60);
+  const totalDays = Math.floor(totalHours / 24);
+
+  const days = totalDays;
+  const hours = totalHours % 24;
+  const minutes = totalMinutes % 60;
+
+  const parts = [];
+  if (days > 0) parts.push(`${days}d`);
+  if (hours > 0) parts.push(`${hours}h`);
+  if (minutes > 0 || parts.length === 0) parts.push(`${minutes}m`);
+
+  return `in ${parts.join(' ')}`;
+}
+
+/**
+ * Format reset time with relative time and UTC time
+ * Example: "in 1h 23m (11:00 PM UTC)"
+ *
+ * @param {string} resetTime - Time string in format "HH:MM AM/PM"
+ * @returns {string} - Formatted string with relative and absolute time
+ */
+export function formatResetTimeWithRelative(resetTime) {
+  if (!resetTime) {
+    return resetTime;
+  }
+
+  const resetDate = parseResetTime(resetTime);
+  if (!resetDate) {
+    // If we can't parse it, return the original time
+    return resetTime;
+  }
+
+  const relativeTime = formatRelativeTime(resetDate);
+
+  // Format the UTC time
+  const utcHours = resetDate.getUTCHours();
+  const utcMinutes = resetDate.getUTCMinutes();
+  const utcAmPm = utcHours >= 12 ? 'PM' : 'AM';
+  const utcHour12 = utcHours % 12 || 12;
+  const utcTimeStr = `${utcHour12}:${String(utcMinutes).padStart(2, '0')} ${utcAmPm} UTC`;
+
+  return `${relativeTime} (${utcTimeStr})`;
+}
+
 /**
  * Format usage limit error message for console output
  *