@link-assistant/hive-mind 1.71.1 → 1.72.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @link-assistant/hive-mind
 
+## 1.72.0
+
+### Minor Changes
+
+- fffdfbf: Add experimental `--resume-on-auto-restart` support for resuming Claude auto-restart sessions with a minimal uncommitted-change prompt.
+
 ## 1.71.1
 
 ### Patch Changes

package/CLAUDE.md

@@ -1,5 +1,5 @@
-Issue to solve: https://github.com/link-assistant/hive-mind/issues/962
-Your prepared branch: issue-962-7502f60e53a0
-Your prepared working directory: /tmp/gh-issue-solver-1766423610256
+Issue to solve: undefined
+Your prepared branch: issue-644-cf3b8243
+Your prepared working directory: /tmp/gh-issue-solver-1762010397765
 
 Proceed.

package/package.json

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

package/src/claude.prompts.lib.mjs

@@ -17,6 +17,11 @@ import { buildWorkLanguageDirective } from './work-language.prompts.lib.mjs';
 export const buildUserPrompt = params => {
   const { issueUrl, issueNumber, prNumber, prUrl, branchName, tempDir, workspaceTmpDir, isContinueMode, forkedRepo, feedbackLines, owner, repo, argv, contributingGuidelines, claudeVersion } = params;
 
+  if (argv?.minimalRestartContext && argv.resume) {
+    const lines = feedbackLines && feedbackLines.length > 0 ? feedbackLines : ['Continue the auto-restart from the previous resumed session.'];
+    return `${lines.join('\n')}\n`;
+  }
+
   const promptLines = [];
 
   // Issue or PR reference
@@ -87,6 +92,10 @@ export const buildUserPrompt = params => {
 export const buildSystemPrompt = params => {
   const { owner, repo, issueNumber, prNumber, branchName, workspaceTmpDir, argv, modelSupportsVision, forkedRepo } = params;
 
+  if (argv?.minimalRestartContext && argv.resume) {
+    return '';
+  }
+
   // When in fork mode, screenshots are pushed to the fork, not the original repo
   const screenshotRepoPath = argv?.fork && forkedRepo ? forkedRepo : `${owner}/${repo}`;
 

package/src/solve.config.lib.mjs

@@ -187,6 +187,11 @@ export const SOLVE_OPTION_DEFINITIONS = {
     description: 'Maximum number of auto-restart iterations before stopping (default: 5, 0 = unlimited)',
     default: 5,
   },
+  'resume-on-auto-restart': {
+    type: 'boolean',
+    description: '[EXPERIMENTAL] Resume the previous Claude session on uncommitted-change auto-restart and send only a minimal restart prompt. Disabled by default.',
+    default: false,
+  },
   'auto-resume-max-iterations': {
     type: 'number',
     description: 'Maximum number of automatic resume/restart continuations after usage-limit resets (default: 5, 0 = unlimited)',

package/src/solve.minimal-restart-prompt.lib.mjs

@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+/**
+ * Generate minimal prompt for auto-restart with session resume
+ * This module provides functions to create lightweight prompts for auto-restart
+ * that assume the AI has full context from the previous session
+ *
+ * Part of the cost optimization feature for issue #661
+ * @see case-studies/issue-661-session-resume-cost-optimization/
+ */
+
+// Note: This module does not import $ directly
+// Functions receive $ as a parameter from the calling module
+// This ensures consistent command executor usage across the codebase
+
+/**
+ * Generate minimal prompt for auto-restart with session resume
+ * This prompt assumes the AI has full context from the previous session
+ * Target: ~500 tokens (compared to 50k-200k in full context)
+ *
+ * @param {string} tempDir - Working directory
+ * @param {object} $ - Command executor
+ * @returns {Promise<string>} Minimal restart prompt
+ */
+export const generateMinimalRestartPrompt = async (tempDir, $) => {
+  // Get uncommitted changes
+  const gitStatus = await $({ cwd: tempDir })`git status --porcelain`;
+  const uncommittedFiles = gitStatus.stdout.toString().trim();
+
+  // Get brief diff summaries (not full diffs to keep the prompt minimal)
+  const gitDiffStat = await $({ cwd: tempDir })`git diff --stat`;
+  const unstagedDiffSummary = gitDiffStat.stdout.toString().trim();
+  const gitCachedDiffStat = await $({ cwd: tempDir })`git diff --cached --stat`;
+  const stagedDiffSummary = gitCachedDiffStat.stdout.toString().trim();
+  const summarySections = [];
+  if (unstagedDiffSummary) summarySections.push(`Unstaged changes:\n${unstagedDiffSummary}`);
+  if (stagedDiffSummary) summarySections.push(`Staged changes:\n${stagedDiffSummary}`);
+  const diffSummary = summarySections.join('\n\n') || 'No tracked-file diff summary available.';
+
+  // Count changes
+  const fileCount = uncommittedFiles.split('\n').filter(line => line.trim()).length;
+
+  return `🔄 Auto-restart: resume the previous session and handle its uncommitted changes.
+
+Uncommitted files (${fileCount}):
+${uncommittedFiles}
+
+Changes summary:
+${diffSummary}
+
+Please review these changes and commit them with an appropriate commit message.
+Follow the repository's commit message conventions from previous commits.`;
+};
+
+/**
+ * Generate full context prompt (fallback when resume fails or not enabled)
+ * This is used when session resume is not available or failed
+ *
+ * @param {string} issueUrl - Issue URL
+ * @param {string} issueBody - Issue description
+ * @param {number} prNumber - PR number
+ * @param {Array<string>} feedbackLines - Feedback from reviewers
+ * @param {string} tempDir - Working directory
+ * @param {object} $ - Command executor
+ * @returns {Promise<string>} Full restart prompt
+ */
+export const generateFullRestartPrompt = async (issueUrl, issueBody, prNumber, feedbackLines, tempDir, $) => {
+  // Get uncommitted changes with full diff
+  const gitStatus = await $({ cwd: tempDir })`git status --porcelain`;
+  const uncommittedFiles = gitStatus.stdout.toString().trim();
+
+  const gitDiff = await $({ cwd: tempDir })`git diff`;
+  const fullDiff = gitDiff.stdout.toString();
+
+  let prompt = `
+Continuing work on issue: ${issueUrl}
+
+Previous session completed but left uncommitted changes.
+  `.trim();
+
+  if (feedbackLines && feedbackLines.length > 0) {
+    prompt += `\n\nFeedback from reviewers:\n${feedbackLines.join('\n')}`;
+  }
+
+  prompt += `\n\nUncommitted changes:\n${uncommittedFiles}\n\nFull diff:\n${fullDiff}`;
+
+  prompt += '\n\nPlease review these changes and commit them appropriately.';
+
+  return prompt;
+};

package/src/solve.mjs

@@ -826,6 +826,13 @@ try {
   limitReached = toolResult.limitReached;
   cleanupContext.limitReached = limitReached;
 
+  if (sessionId && (argv.resumeOnAutoRestart || argv['resume-on-auto-restart'])) {
+    global.previousSessionId = sessionId;
+    if (argv.verbose) {
+      await log(`Session ID stored for auto-restart resume: ${sessionId}`, { verbose: true });
+    }
+  }
+
   // Capture limit reset time and timezone globally for downstream handlers (auto-continue, cleanup decisions)
   if (toolResult && toolResult.limitResetTime) {
     global.limitResetTime = toolResult.limitResetTime;

package/src/solve.watch.lib.mjs

@@ -290,6 +290,38 @@ export const watchForFeedback = async params => {
         // to comments posted during *this* iteration only, not across the whole watch loop.
         const iterationStartTime = new Date();
 
+        let restartFeedbackLines = feedbackLines;
+        let restartArgv = argv;
+        const shouldUseSessionResume = Boolean(isTemporaryWatch && (firstIterationInTemporaryMode || hasUncommittedInTempMode) && (argv.resumeOnAutoRestart || argv['resume-on-auto-restart']) && (argv.tool === 'claude' || !argv.tool) && global.previousSessionId);
+
+        if (shouldUseSessionResume) {
+          await log(formatAligned('', 'Experimental session resume: using minimal auto-restart prompt', '', 2));
+          await log(formatAligned('', `Resuming session: ${global.previousSessionId}`, '', 2));
+
+          if (argv.verbose) {
+            try {
+              const { calculateSessionTokens } = await import('./claude.lib.mjs');
+              const tokenUsage = await calculateSessionTokens(global.previousSessionId, tempDir);
+              if (tokenUsage?.totalTokens) {
+                await log(formatAligned('', `Previous session tokens: ${tokenUsage.totalTokens.toLocaleString()}`, '', 2));
+              }
+            } catch {
+              await log(formatAligned('', 'Could not read previous session token usage', '', 2));
+            }
+          }
+
+          const { generateMinimalRestartPrompt } = await import('./solve.minimal-restart-prompt.lib.mjs');
+          const minimalPrompt = await generateMinimalRestartPrompt(tempDir, $);
+          restartFeedbackLines = [minimalPrompt];
+          restartArgv = {
+            ...argv,
+            resume: global.previousSessionId,
+            minimalRestartContext: true,
+          };
+
+          await log(formatAligned('', `Minimal restart prompt size: ${minimalPrompt.length} characters`, '', 2));
+        }
+
         // Execute tool using shared utility
         const toolResult = await executeToolIteration({
           issueUrl,
@@ -300,10 +332,14 @@ export const watchForFeedback = async params => {
           branchName: prBranch || branchName,
           tempDir,
           mergeStateStatus,
-          feedbackLines,
-          argv,
+          feedbackLines: restartFeedbackLines,
+          argv: restartArgv,
         });
 
+        if (toolResult.sessionId && (argv.resumeOnAutoRestart || argv['resume-on-auto-restart'])) {
+          global.previousSessionId = toolResult.sessionId;
+        }
+
         if (!toolResult.success) {
           // Check if this is an API error using shared utility
           if (isApiError(toolResult)) {