@link-assistant/hive-mind 1.6.3 ā 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
# @link-assistant/hive-mind
|
|
2
2
|
|
|
3
|
+
## 1.7.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 5794e2f: Add `--working-directory` / `-d` option for proper session resume
|
|
8
|
+
|
|
9
|
+
Claude Code stores sessions per-directory path, so resuming a session in a different directory fails. This change:
|
|
10
|
+
1. Adds `--working-directory` / `-d` option to solve.mjs
|
|
11
|
+
- If directory exists with git repo, uses it without cloning
|
|
12
|
+
- If directory exists but empty, clones into it
|
|
13
|
+
- If directory doesn't exist, creates it and clones
|
|
14
|
+
2. Updates `--auto-resume-on-limit-reset` to pass `--working-directory`
|
|
15
|
+
- When limit resets and session auto-resumes, it uses the same directory as the original session
|
|
16
|
+
- This ensures Claude Code can find and resume the session
|
|
17
|
+
3. Improves resume error messaging
|
|
18
|
+
- Warns when resuming without --working-directory
|
|
19
|
+
- Explains that Claude Code sessions are tied to directory paths
|
|
20
|
+
|
|
21
|
+
Example usage:
|
|
22
|
+
|
|
23
|
+
```bash
|
|
24
|
+
./solve.mjs "<url>" --resume <session-id> --working-directory /tmp/gh-issue-solver-123
|
|
25
|
+
```
|
|
26
|
+
|
|
3
27
|
## 1.6.3
|
|
4
28
|
|
|
5
29
|
### Patch Changes
|
package/package.json
CHANGED
|
@@ -65,7 +65,9 @@ const formatWaitTime = ms => {
|
|
|
65
65
|
};
|
|
66
66
|
|
|
67
67
|
// Auto-continue function that waits until limit resets
|
|
68
|
-
|
|
68
|
+
// tempDir parameter is required for passing --working-directory to the resumed session
|
|
69
|
+
// (Claude Code sessions are stored per-working-directory, so resume must use same directory)
|
|
70
|
+
export const autoContinueWhenLimitResets = async (issueUrl, sessionId, argv, shouldAttachLogs, tempDir = null) => {
|
|
69
71
|
try {
|
|
70
72
|
const resetTime = global.limitResetTime;
|
|
71
73
|
const waitMs = calculateWaitTime(resetTime);
|
|
@@ -115,6 +117,17 @@ export const autoContinueWhenLimitResets = async (issueUrl, sessionId, argv, sho
|
|
|
115
117
|
if (argv.fork) resumeArgs.push('--fork');
|
|
116
118
|
if (shouldAttachLogs) resumeArgs.push('--attach-logs');
|
|
117
119
|
|
|
120
|
+
// CRITICAL: Pass --working-directory to ensure Claude Code session resume works correctly
|
|
121
|
+
// Claude Code stores sessions per working directory, so resume MUST use the same directory
|
|
122
|
+
// Without this, resume creates a NEW temp directory and session is not found
|
|
123
|
+
if (tempDir) {
|
|
124
|
+
resumeArgs.push('--working-directory', tempDir);
|
|
125
|
+
await log(`š Using working directory for session continuity: ${tempDir}`);
|
|
126
|
+
} else {
|
|
127
|
+
await log(`ā ļø Warning: No working directory specified - session resume may fail`);
|
|
128
|
+
await log(` Claude Code sessions are stored per-directory, consider using --working-directory`);
|
|
129
|
+
}
|
|
130
|
+
|
|
118
131
|
await log(`\nš Executing: ${resumeArgs.join(' ')}`);
|
|
119
132
|
|
|
120
133
|
// Execute the resume command
|
|
@@ -136,7 +149,11 @@ export const autoContinueWhenLimitResets = async (issueUrl, sessionId, argv, sho
|
|
|
136
149
|
});
|
|
137
150
|
await log(`\nā Auto-continue failed: ${cleanErrorMessage(error)}`, { level: 'error' });
|
|
138
151
|
await log('\nš Manual resume command:');
|
|
139
|
-
|
|
152
|
+
if (tempDir) {
|
|
153
|
+
await log(`./solve.mjs "${issueUrl}" --resume ${sessionId} --working-directory "${tempDir}"`);
|
|
154
|
+
} else {
|
|
155
|
+
await log(`./solve.mjs "${issueUrl}" --resume ${sessionId}`);
|
|
156
|
+
}
|
|
140
157
|
await safeExit(1, 'Auto-continue failed');
|
|
141
158
|
}
|
|
142
159
|
};
|
package/src/solve.config.lib.mjs
CHANGED
|
@@ -47,6 +47,11 @@ export const createYargsConfig = yargsInstance => {
|
|
|
47
47
|
description: 'Resume from a previous session ID (when limit was reached)',
|
|
48
48
|
alias: 'r',
|
|
49
49
|
})
|
|
50
|
+
.option('working-directory', {
|
|
51
|
+
type: 'string',
|
|
52
|
+
description: 'Use specified working directory instead of creating a new temp directory. If directory does not exist, it will be created and the repository will be cloned. Essential for --resume to work correctly with Claude Code sessions.',
|
|
53
|
+
alias: 'd',
|
|
54
|
+
})
|
|
50
55
|
.option('only-prepare-command', {
|
|
51
56
|
type: 'boolean',
|
|
52
57
|
description: 'Only prepare and print the claude command without executing it',
|
package/src/solve.mjs
CHANGED
|
@@ -513,7 +513,7 @@ if (isPrUrl) {
|
|
|
513
513
|
// Create or find temporary directory for cloning the repository
|
|
514
514
|
// Pass workspace info for --enable-workspaces mode (works with all tools)
|
|
515
515
|
const workspaceInfo = argv.enableWorkspaces ? { owner, repo, issueNumber } : null;
|
|
516
|
-
const { tempDir, workspaceTmpDir } = await setupTempDirectory(argv, workspaceInfo);
|
|
516
|
+
const { tempDir, workspaceTmpDir, needsClone } = await setupTempDirectory(argv, workspaceInfo);
|
|
517
517
|
// Populate cleanup context for signal handlers
|
|
518
518
|
cleanupContext.tempDir = tempDir;
|
|
519
519
|
cleanupContext.argv = argv;
|
|
@@ -521,6 +521,7 @@ cleanupContext.argv = argv;
|
|
|
521
521
|
let limitReached = false;
|
|
522
522
|
try {
|
|
523
523
|
// Set up repository and clone using the new module
|
|
524
|
+
// If --working-directory points to existing repo, needsClone is false and we skip cloning
|
|
524
525
|
const { forkedRepo } = await setupRepositoryAndClone({
|
|
525
526
|
argv,
|
|
526
527
|
owner,
|
|
@@ -532,6 +533,7 @@ try {
|
|
|
532
533
|
log,
|
|
533
534
|
formatAligned,
|
|
534
535
|
$,
|
|
536
|
+
needsClone,
|
|
535
537
|
});
|
|
536
538
|
|
|
537
539
|
// Verify default branch and status using the new module
|
|
@@ -3,14 +3,23 @@
|
|
|
3
3
|
* Handles repository cloning, forking, and remote setup
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
export async function setupRepositoryAndClone({ argv, owner, repo, forkOwner, tempDir, isContinueMode, issueUrl, log,
|
|
6
|
+
export async function setupRepositoryAndClone({ argv, owner, repo, forkOwner, tempDir, isContinueMode, issueUrl, log, $, needsClone = true }) {
|
|
7
7
|
// Set up repository and handle forking
|
|
8
8
|
const { repoToClone, forkedRepo, upstreamRemote, prForkOwner } = await setupRepository(argv, owner, repo, forkOwner, issueUrl);
|
|
9
9
|
|
|
10
|
-
// Clone repository and set up remotes
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
// Clone repository and set up remotes (skip if needsClone is false - directory already has repo)
|
|
11
|
+
if (needsClone) {
|
|
12
|
+
await cloneRepository(repoToClone, tempDir, argv, owner, repo);
|
|
13
|
+
// Set up upstream remote and sync fork if needed
|
|
14
|
+
await setupUpstreamAndSync(tempDir, forkedRepo, upstreamRemote, owner, repo, argv);
|
|
15
|
+
} else {
|
|
16
|
+
await log('ā¹ļø Skipping clone: Using existing repository in working directory');
|
|
17
|
+
// Still need to ensure upstream remote is set up if using fork mode
|
|
18
|
+
if (forkedRepo && upstreamRemote) {
|
|
19
|
+
await setupUpstreamAndSync(tempDir, forkedRepo, upstreamRemote, owner, repo, argv);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
14
23
|
// Set up pr-fork remote if we're continuing someone else's fork PR with --fork flag
|
|
15
24
|
const prForkRemote = await setupPrForkRemote(tempDir, argv, prForkOwner, repo, isContinueMode, owner);
|
|
16
25
|
|
|
@@ -220,16 +220,58 @@ export const buildWorkspacePath = (owner, repo, issueNumber, timestamp) => {
|
|
|
220
220
|
// When --enable-workspaces is used, creates:
|
|
221
221
|
// {workspace}/repository - for the cloned repo
|
|
222
222
|
// {workspace}/tmp - for temp files, logs, downloads
|
|
223
|
+
// When --working-directory is used, uses the specified directory (creates if needed)
|
|
223
224
|
export const setupTempDirectory = async (argv, workspaceInfo = null) => {
|
|
224
225
|
let tempDir;
|
|
225
226
|
let workspaceTmpDir = null;
|
|
226
227
|
let isResuming = argv.resume;
|
|
228
|
+
// needsClone indicates if the repository needs to be cloned into the directory
|
|
229
|
+
// This is true when: new directory is created, or existing directory is empty
|
|
230
|
+
let needsClone = true;
|
|
227
231
|
|
|
228
232
|
// Check if workspace mode should be enabled (works with all tools)
|
|
229
233
|
const useWorkspaces = argv.enableWorkspaces;
|
|
230
234
|
|
|
235
|
+
// Priority 1: --working-directory option takes precedence over all other directory selection
|
|
236
|
+
// This is essential for --resume to work correctly with Claude Code sessions,
|
|
237
|
+
// because Claude Code stores sessions by working directory path, not session ID alone
|
|
238
|
+
if (argv.workingDirectory) {
|
|
239
|
+
tempDir = path.resolve(argv.workingDirectory);
|
|
240
|
+
|
|
241
|
+
// Check if directory exists
|
|
242
|
+
try {
|
|
243
|
+
const stat = await fs.stat(tempDir);
|
|
244
|
+
if (stat.isDirectory()) {
|
|
245
|
+
// Directory exists - check if it contains a git repository
|
|
246
|
+
try {
|
|
247
|
+
await fs.access(path.join(tempDir, '.git'));
|
|
248
|
+
// Git repository exists - no need to clone
|
|
249
|
+
needsClone = false;
|
|
250
|
+
await log(`\n${formatAligned('š', 'Working directory:', tempDir)}`);
|
|
251
|
+
await log(formatAligned('', 'Status:', 'Using existing repository', 2));
|
|
252
|
+
if (isResuming) {
|
|
253
|
+
await log(formatAligned('', 'Session:', `Resuming ${argv.resume}`, 2));
|
|
254
|
+
}
|
|
255
|
+
} catch {
|
|
256
|
+
// No .git directory - directory is empty or doesn't have a repo, will clone
|
|
257
|
+
await log(`\n${formatAligned('š', 'Working directory:', tempDir)}`);
|
|
258
|
+
await log(formatAligned('', 'Status:', 'Directory exists but no repository - will clone', 2));
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
} catch {
|
|
262
|
+
// Directory doesn't exist - create it
|
|
263
|
+
await fs.mkdir(tempDir, { recursive: true });
|
|
264
|
+
await log(`\n${formatAligned('š', 'Working directory:', tempDir)}`);
|
|
265
|
+
await log(formatAligned('', 'Status:', 'Created new directory - will clone repository', 2));
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
return { tempDir, workspaceTmpDir, isResuming, needsClone };
|
|
269
|
+
}
|
|
270
|
+
|
|
231
271
|
if (isResuming) {
|
|
232
|
-
// When resuming
|
|
272
|
+
// When resuming without --working-directory, create a new temp directory
|
|
273
|
+
// WARNING: This will NOT work correctly with Claude Code because the session
|
|
274
|
+
// is stored in a path-specific location. Use --working-directory for proper resume.
|
|
233
275
|
const scriptDir = path.dirname(process.argv[1]);
|
|
234
276
|
const sessionLogPattern = path.join(scriptDir, `${argv.resume}.log`);
|
|
235
277
|
|
|
@@ -241,7 +283,9 @@ export const setupTempDirectory = async (argv, workspaceInfo = null) => {
|
|
|
241
283
|
// For resumed sessions, create new temp directory since old one may be cleaned up
|
|
242
284
|
tempDir = path.join(os.tmpdir(), `gh-issue-solver-resume-${argv.resume}-${Date.now()}`);
|
|
243
285
|
await fs.mkdir(tempDir, { recursive: true });
|
|
244
|
-
await log(
|
|
286
|
+
await log(`ā ļø Creating new temporary directory for resumed session: ${tempDir}`);
|
|
287
|
+
await log(` Note: Claude Code sessions are tied to working directory paths.`);
|
|
288
|
+
await log(` If session resume fails, use --working-directory to specify the original directory.`);
|
|
245
289
|
} catch (err) {
|
|
246
290
|
reportError(err, {
|
|
247
291
|
context: 'resume_session_lookup',
|
|
@@ -280,7 +324,7 @@ export const setupTempDirectory = async (argv, workspaceInfo = null) => {
|
|
|
280
324
|
await log(`\nCreating temporary directory: ${tempDir}`);
|
|
281
325
|
}
|
|
282
326
|
|
|
283
|
-
return { tempDir, workspaceTmpDir, isResuming };
|
|
327
|
+
return { tempDir, workspaceTmpDir, isResuming, needsClone };
|
|
284
328
|
};
|
|
285
329
|
|
|
286
330
|
// Try to initialize an empty repository by creating a simple README.md
|
|
@@ -377,7 +377,9 @@ export const showSessionSummary = async (sessionId, limitReached, argv, issueUrl
|
|
|
377
377
|
|
|
378
378
|
if (argv.autoResumeOnLimitReset && global.limitResetTime) {
|
|
379
379
|
await log(`\nš AUTO-RESUME ON LIMIT RESET ENABLED - Will resume at ${global.limitResetTime}`);
|
|
380
|
-
|
|
380
|
+
// Pass tempDir to ensure resumed session uses the same working directory
|
|
381
|
+
// This is critical for Claude Code session resume to work correctly
|
|
382
|
+
await autoContinueWhenLimitResets(issueUrl, sessionId, argv, shouldAttachLogs, tempDir);
|
|
381
383
|
} else {
|
|
382
384
|
if (global.limitResetTime) {
|
|
383
385
|
await log(`\nā° Limit resets at: ${global.limitResetTime}`);
|