@synergenius/flow-weaver-pack-weaver 0.9.8 → 0.9.10
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/dist/bot/agent-loop.d.ts +20 -0
- package/dist/bot/agent-loop.d.ts.map +1 -0
- package/dist/bot/agent-loop.js +331 -0
- package/dist/bot/agent-loop.js.map +1 -0
- package/dist/bot/agent-provider.d.ts.map +1 -1
- package/dist/bot/agent-provider.js +3 -2
- package/dist/bot/agent-provider.js.map +1 -1
- package/dist/bot/approvals.js +17 -8
- package/dist/bot/approvals.js.map +1 -1
- package/dist/bot/assistant-core.d.ts +17 -0
- package/dist/bot/assistant-core.d.ts.map +1 -1
- package/dist/bot/assistant-core.js +366 -45
- package/dist/bot/assistant-core.js.map +1 -1
- package/dist/bot/assistant-tools.d.ts +1 -1
- package/dist/bot/assistant-tools.d.ts.map +1 -1
- package/dist/bot/assistant-tools.js +283 -9
- package/dist/bot/assistant-tools.js.map +1 -1
- package/dist/bot/bot-agent-channel.d.ts.map +1 -1
- package/dist/bot/bot-agent-channel.js +2 -0
- package/dist/bot/bot-agent-channel.js.map +1 -1
- package/dist/bot/bot-manager.d.ts +4 -0
- package/dist/bot/bot-manager.d.ts.map +1 -1
- package/dist/bot/bot-manager.js +72 -27
- package/dist/bot/bot-manager.js.map +1 -1
- package/dist/bot/conversation-store.d.ts +6 -5
- package/dist/bot/conversation-store.d.ts.map +1 -1
- package/dist/bot/conversation-store.js +98 -42
- package/dist/bot/conversation-store.js.map +1 -1
- package/dist/bot/cost-store.d.ts +3 -0
- package/dist/bot/cost-store.d.ts.map +1 -1
- package/dist/bot/cost-store.js +21 -10
- package/dist/bot/cost-store.js.map +1 -1
- package/dist/bot/cost-tracker.d.ts.map +1 -1
- package/dist/bot/cost-tracker.js +14 -1
- package/dist/bot/cost-tracker.js.map +1 -1
- package/dist/bot/cron-parser.d.ts.map +1 -1
- package/dist/bot/cron-parser.js +2 -0
- package/dist/bot/cron-parser.js.map +1 -1
- package/dist/bot/cron-scheduler.d.ts.map +1 -1
- package/dist/bot/cron-scheduler.js +1 -0
- package/dist/bot/cron-scheduler.js.map +1 -1
- package/dist/bot/device-connection.d.ts +13 -0
- package/dist/bot/device-connection.d.ts.map +1 -0
- package/dist/bot/device-connection.js +102 -0
- package/dist/bot/device-connection.js.map +1 -0
- package/dist/bot/error-classifier.d.ts.map +1 -1
- package/dist/bot/error-classifier.js +5 -0
- package/dist/bot/error-classifier.js.map +1 -1
- package/dist/bot/file-lock.d.ts.map +1 -1
- package/dist/bot/file-lock.js +13 -3
- package/dist/bot/file-lock.js.map +1 -1
- package/dist/bot/file-watcher.d.ts.map +1 -1
- package/dist/bot/file-watcher.js +1 -0
- package/dist/bot/file-watcher.js.map +1 -1
- package/dist/bot/genesis-prompt-context.d.ts +5 -0
- package/dist/bot/genesis-prompt-context.d.ts.map +1 -1
- package/dist/bot/genesis-prompt-context.js +55 -0
- package/dist/bot/genesis-prompt-context.js.map +1 -1
- package/dist/bot/genesis-store.d.ts +4 -0
- package/dist/bot/genesis-store.d.ts.map +1 -1
- package/dist/bot/genesis-store.js +79 -12
- package/dist/bot/genesis-store.js.map +1 -1
- package/dist/bot/improve-loop.d.ts +46 -0
- package/dist/bot/improve-loop.d.ts.map +1 -0
- package/dist/bot/improve-loop.js +592 -0
- package/dist/bot/improve-loop.js.map +1 -0
- package/dist/bot/index.d.ts +1 -0
- package/dist/bot/index.d.ts.map +1 -1
- package/dist/bot/index.js +2 -0
- package/dist/bot/index.js.map +1 -1
- package/dist/bot/insight-engine.d.ts +12 -0
- package/dist/bot/insight-engine.d.ts.map +1 -0
- package/dist/bot/insight-engine.js +256 -0
- package/dist/bot/insight-engine.js.map +1 -0
- package/dist/bot/knowledge-store.d.ts.map +1 -1
- package/dist/bot/knowledge-store.js +4 -1
- package/dist/bot/knowledge-store.js.map +1 -1
- package/dist/bot/pipeline-runner.d.ts.map +1 -1
- package/dist/bot/pipeline-runner.js +12 -4
- package/dist/bot/pipeline-runner.js.map +1 -1
- package/dist/bot/project-model.d.ts +25 -0
- package/dist/bot/project-model.d.ts.map +1 -0
- package/dist/bot/project-model.js +372 -0
- package/dist/bot/project-model.js.map +1 -0
- package/dist/bot/response-formatter.js +2 -3
- package/dist/bot/response-formatter.js.map +1 -1
- package/dist/bot/run-store.d.ts.map +1 -1
- package/dist/bot/run-store.js +10 -2
- package/dist/bot/run-store.js.map +1 -1
- package/dist/bot/safe-path.d.ts +1 -1
- package/dist/bot/safe-path.d.ts.map +1 -1
- package/dist/bot/safe-path.js +20 -1
- package/dist/bot/safe-path.js.map +1 -1
- package/dist/bot/safety.d.ts +10 -2
- package/dist/bot/safety.d.ts.map +1 -1
- package/dist/bot/safety.js +45 -2
- package/dist/bot/safety.js.map +1 -1
- package/dist/bot/session-state.d.ts +4 -0
- package/dist/bot/session-state.d.ts.map +1 -1
- package/dist/bot/session-state.js +52 -9
- package/dist/bot/session-state.js.map +1 -1
- package/dist/bot/slash-commands.d.ts.map +1 -1
- package/dist/bot/slash-commands.js +100 -5
- package/dist/bot/slash-commands.js.map +1 -1
- package/dist/bot/steering-engine.d.ts +67 -0
- package/dist/bot/steering-engine.d.ts.map +1 -0
- package/dist/bot/steering-engine.js +198 -0
- package/dist/bot/steering-engine.js.map +1 -0
- package/dist/bot/step-executor.d.ts.map +1 -1
- package/dist/bot/step-executor.js +62 -25
- package/dist/bot/step-executor.js.map +1 -1
- package/dist/bot/system-prompt.d.ts.map +1 -1
- package/dist/bot/system-prompt.js +5 -2
- package/dist/bot/system-prompt.js.map +1 -1
- package/dist/bot/task-queue.d.ts +6 -1
- package/dist/bot/task-queue.d.ts.map +1 -1
- package/dist/bot/task-queue.js +43 -4
- package/dist/bot/task-queue.js.map +1 -1
- package/dist/bot/tool-registry.d.ts +1 -1
- package/dist/bot/tool-registry.d.ts.map +1 -1
- package/dist/bot/tool-registry.js +65 -4
- package/dist/bot/tool-registry.js.map +1 -1
- package/dist/bot/trust-calculator.d.ts +34 -0
- package/dist/bot/trust-calculator.d.ts.map +1 -0
- package/dist/bot/trust-calculator.js +67 -0
- package/dist/bot/trust-calculator.js.map +1 -0
- package/dist/bot/types.d.ts +97 -0
- package/dist/bot/types.d.ts.map +1 -1
- package/dist/bot/update-checker.d.ts +21 -0
- package/dist/bot/update-checker.d.ts.map +1 -0
- package/dist/bot/update-checker.js +129 -0
- package/dist/bot/update-checker.js.map +1 -0
- package/dist/bot/weaver-tools.d.ts.map +1 -1
- package/dist/bot/weaver-tools.js +11 -4
- package/dist/bot/weaver-tools.js.map +1 -1
- package/dist/cli-bridge.d.ts.map +1 -1
- package/dist/cli-bridge.js +2 -1
- package/dist/cli-bridge.js.map +1 -1
- package/dist/cli-handlers.d.ts +9 -1
- package/dist/cli-handlers.d.ts.map +1 -1
- package/dist/cli-handlers.js +77 -8
- package/dist/cli-handlers.js.map +1 -1
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +749 -0
- package/dist/cli.js.map +1 -0
- package/dist/docs/weaver-config.md +15 -9
- package/dist/handlers/on-execution-completed.d.ts +11 -0
- package/dist/handlers/on-execution-completed.d.ts.map +1 -0
- package/dist/handlers/on-execution-completed.js +25 -0
- package/dist/handlers/on-execution-completed.js.map +1 -0
- package/dist/mcp-tools.d.ts.map +1 -1
- package/dist/mcp-tools.js +33 -0
- package/dist/mcp-tools.js.map +1 -1
- package/dist/node-types/genesis-approve.d.ts.map +1 -1
- package/dist/node-types/genesis-approve.js +28 -3
- package/dist/node-types/genesis-approve.js.map +1 -1
- package/dist/node-types/genesis-observe.d.ts.map +1 -1
- package/dist/node-types/genesis-observe.js +23 -13
- package/dist/node-types/genesis-observe.js.map +1 -1
- package/dist/node-types/genesis-propose.d.ts.map +1 -1
- package/dist/node-types/genesis-propose.js +8 -0
- package/dist/node-types/genesis-propose.js.map +1 -1
- package/dist/node-types/genesis-update-history.d.ts.map +1 -1
- package/dist/node-types/genesis-update-history.js +13 -0
- package/dist/node-types/genesis-update-history.js.map +1 -1
- package/dist/templates/weaver-template.d.ts +11 -0
- package/dist/templates/weaver-template.d.ts.map +1 -0
- package/dist/templates/weaver-template.js +53 -0
- package/dist/templates/weaver-template.js.map +1 -0
- package/dist/workflows/weaver-bot-session.d.ts +65 -0
- package/dist/workflows/weaver-bot-session.d.ts.map +1 -0
- package/dist/workflows/weaver-bot-session.js +68 -0
- package/dist/workflows/weaver-bot-session.js.map +1 -0
- package/dist/workflows/weaver.d.ts +24 -0
- package/dist/workflows/weaver.d.ts.map +1 -0
- package/dist/workflows/weaver.js +28 -0
- package/dist/workflows/weaver.js.map +1 -0
- package/flowweaver.manifest.json +27 -0
- package/package.json +5 -2
- package/src/bot/agent-provider.ts +3 -2
- package/src/bot/approvals.ts +16 -8
- package/src/bot/assistant-core.ts +366 -44
- package/src/bot/assistant-tools.ts +291 -9
- package/src/bot/bot-agent-channel.ts +2 -0
- package/src/bot/bot-manager.ts +70 -29
- package/src/bot/conversation-store.ts +87 -42
- package/src/bot/cost-store.ts +20 -9
- package/src/bot/cost-tracker.ts +13 -1
- package/src/bot/cron-parser.ts +1 -0
- package/src/bot/cron-scheduler.ts +1 -0
- package/src/bot/device-connection.ts +102 -0
- package/src/bot/error-classifier.ts +5 -0
- package/src/bot/file-lock.ts +12 -2
- package/src/bot/file-watcher.ts +1 -0
- package/src/bot/genesis-prompt-context.ts +61 -0
- package/src/bot/genesis-store.ts +68 -16
- package/src/bot/improve-loop.ts +651 -0
- package/src/bot/index.ts +3 -0
- package/src/bot/insight-engine.ts +273 -0
- package/src/bot/knowledge-store.ts +4 -1
- package/src/bot/pipeline-runner.ts +11 -6
- package/src/bot/project-model.ts +404 -0
- package/src/bot/response-formatter.ts +2 -3
- package/src/bot/run-store.ts +5 -2
- package/src/bot/safe-path.ts +20 -1
- package/src/bot/safety.ts +57 -3
- package/src/bot/session-state.ts +47 -7
- package/src/bot/slash-commands.ts +103 -5
- package/src/bot/steering-engine.ts +233 -0
- package/src/bot/step-executor.ts +66 -26
- package/src/bot/system-prompt.ts +5 -2
- package/src/bot/task-queue.ts +40 -4
- package/src/bot/tool-registry.ts +67 -5
- package/src/bot/trust-calculator.ts +87 -0
- package/src/bot/types.ts +104 -0
- package/src/bot/update-checker.ts +138 -0
- package/src/bot/weaver-tools.ts +10 -4
- package/src/cli-bridge.ts +2 -1
- package/src/cli-handlers.ts +84 -9
- package/src/handlers/on-execution-completed.ts +30 -0
- package/src/mcp-tools.ts +38 -0
- package/src/node-types/genesis-approve.ts +28 -3
- package/src/node-types/genesis-observe.ts +23 -12
- package/src/node-types/genesis-propose.ts +8 -0
- package/src/node-types/genesis-update-history.ts +12 -0
- package/src/ui/evolution-panel.tsx +96 -0
- package/src/ui/insights-widget.tsx +77 -0
|
@@ -0,0 +1,592 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Improve Loop — autonomous codebase improvement via git worktree.
|
|
3
|
+
*
|
|
4
|
+
* Creates an isolated worktree, runs the insight engine to find issues,
|
|
5
|
+
* generates tasks, executes them through the assistant, verifies with tests,
|
|
6
|
+
* and commits or rolls back. The user's working directory is never touched.
|
|
7
|
+
*
|
|
8
|
+
* Usage: `weaver improve [--max-cycles 20] [--max-failures 3] [--protected "*.config.*"]`
|
|
9
|
+
*
|
|
10
|
+
* General-purpose: works on any project. We dogfood it on ourselves.
|
|
11
|
+
*/
|
|
12
|
+
import * as fs from 'node:fs';
|
|
13
|
+
import * as path from 'node:path';
|
|
14
|
+
import * as os from 'node:os';
|
|
15
|
+
import { execFileSync } from 'node:child_process';
|
|
16
|
+
import { c } from './ansi.js';
|
|
17
|
+
const DEFAULT_PROTECTED = [
|
|
18
|
+
'package.json',
|
|
19
|
+
'package-lock.json',
|
|
20
|
+
'tsconfig.json',
|
|
21
|
+
'*.config.*',
|
|
22
|
+
'.weaver.json',
|
|
23
|
+
'.genesis/**',
|
|
24
|
+
];
|
|
25
|
+
export async function runImproveLoop(config) {
|
|
26
|
+
const { maxCycles, maxConsecutiveFailures, protectedPatterns, testCommand, buildCommand, projectDir, deviceConnection } = config;
|
|
27
|
+
const out = (s) => process.stderr.write(s);
|
|
28
|
+
const emitEvent = (type, data = {}) => {
|
|
29
|
+
deviceConnection?.emit({ type, data, timestamp: Date.now() });
|
|
30
|
+
};
|
|
31
|
+
const cycles = [];
|
|
32
|
+
let consecutiveFailures = 0;
|
|
33
|
+
const completedWork = []; // track what's been done so it doesn't repeat
|
|
34
|
+
const startedAt = new Date().toISOString();
|
|
35
|
+
const branchName = `weaver/improve-${new Date().toISOString().slice(0, 10).replace(/-/g, '')}`;
|
|
36
|
+
const worktreeDir = path.join(projectDir, '.weaver-improve', branchName.replace(/\//g, '-'));
|
|
37
|
+
// Prevent sleep on macOS
|
|
38
|
+
let caffeinate = null;
|
|
39
|
+
try {
|
|
40
|
+
if (process.platform === 'darwin') {
|
|
41
|
+
const { spawn } = await import('node:child_process');
|
|
42
|
+
caffeinate = spawn('caffeinate', ['-i', '-s'], { stdio: 'ignore', detached: true });
|
|
43
|
+
caffeinate.unref();
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch { /* caffeinate not available */ }
|
|
47
|
+
out(`\n ${c.bold('weaver improve')}\n`);
|
|
48
|
+
out(` ${c.dim(`Project: ${path.basename(projectDir)}`)}\n`);
|
|
49
|
+
out(` ${c.dim(`Branch: ${branchName}`)}\n`);
|
|
50
|
+
out(` ${c.dim(`Worktree: ${path.relative(projectDir, worktreeDir)}`)}\n`);
|
|
51
|
+
out(` ${c.dim(`Max cycles: ${maxCycles === 0 ? 'unlimited' : maxCycles}, stop after ${maxConsecutiveFailures} consecutive failures`)}\n`);
|
|
52
|
+
out(` ${c.dim(`Test: ${testCommand}`)}\n`);
|
|
53
|
+
if (caffeinate)
|
|
54
|
+
out(` ${c.dim('Sleep inhibited (caffeinate)')}\n`);
|
|
55
|
+
out('\n');
|
|
56
|
+
// Verify this is a git repo (worktree requires it)
|
|
57
|
+
try {
|
|
58
|
+
execFileSync('git', ['rev-parse', '--git-dir'], { cwd: projectDir, stdio: 'pipe' });
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
out(` ${c.red('✗')} Not a git repository.\n`);
|
|
62
|
+
return emptyResult(startedAt, branchName, worktreeDir, 'complete');
|
|
63
|
+
}
|
|
64
|
+
// Create worktree (clean up stale ones first)
|
|
65
|
+
out(` ${c.dim('Creating worktree...')}\n`);
|
|
66
|
+
try {
|
|
67
|
+
// Remove stale worktree/branch from previous runs
|
|
68
|
+
if (fs.existsSync(worktreeDir)) {
|
|
69
|
+
try {
|
|
70
|
+
execFileSync('git', ['worktree', 'remove', worktreeDir, '--force'], { cwd: projectDir, stdio: 'pipe' });
|
|
71
|
+
}
|
|
72
|
+
catch { /* best effort */ }
|
|
73
|
+
if (fs.existsSync(worktreeDir))
|
|
74
|
+
fs.rmSync(worktreeDir, { recursive: true, force: true });
|
|
75
|
+
}
|
|
76
|
+
try {
|
|
77
|
+
execFileSync('git', ['branch', '-D', branchName], { cwd: projectDir, stdio: 'pipe' });
|
|
78
|
+
}
|
|
79
|
+
catch { /* branch may not exist */ }
|
|
80
|
+
execFileSync('git', ['worktree', 'prune'], { cwd: projectDir, stdio: 'pipe' });
|
|
81
|
+
fs.mkdirSync(path.dirname(worktreeDir), { recursive: true });
|
|
82
|
+
execFileSync('git', ['worktree', 'add', worktreeDir, '-b', branchName], { cwd: projectDir, stdio: 'pipe' });
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
// Branch might already exist — try without -b
|
|
86
|
+
try {
|
|
87
|
+
execFileSync('git', ['worktree', 'add', worktreeDir, branchName], { cwd: projectDir, stdio: 'pipe' });
|
|
88
|
+
}
|
|
89
|
+
catch (err) {
|
|
90
|
+
out(` ${c.red('✗')} Failed to create worktree: ${err instanceof Error ? err.message : err}\n`);
|
|
91
|
+
return emptyResult(startedAt, branchName, worktreeDir, 'complete');
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
// Ensure node_modules is gitignored in worktree (symlink shouldn't be committed)
|
|
95
|
+
try {
|
|
96
|
+
const wtGitignore = path.join(worktreeDir, '.gitignore');
|
|
97
|
+
const existing = fs.existsSync(wtGitignore) ? fs.readFileSync(wtGitignore, 'utf-8') : '';
|
|
98
|
+
if (!existing.includes('node_modules')) {
|
|
99
|
+
fs.appendFileSync(wtGitignore, '\nnode_modules/\n');
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
catch { /* non-fatal */ }
|
|
103
|
+
// Install deps in worktree if needed
|
|
104
|
+
const worktreeNodeModules = path.join(worktreeDir, 'node_modules');
|
|
105
|
+
if (!fs.existsSync(worktreeNodeModules)) {
|
|
106
|
+
// Symlink node_modules from main tree for speed
|
|
107
|
+
try {
|
|
108
|
+
const mainNodeModules = path.join(projectDir, 'node_modules');
|
|
109
|
+
if (fs.existsSync(mainNodeModules)) {
|
|
110
|
+
fs.symlinkSync(mainNodeModules, worktreeNodeModules);
|
|
111
|
+
out(` ${c.dim('Linked node_modules from main tree')}\n`);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
catch { /* will need npm install */ }
|
|
115
|
+
}
|
|
116
|
+
// Build in worktree if needed
|
|
117
|
+
if (buildCommand) {
|
|
118
|
+
out(` ${c.dim('Building in worktree...')}\n`);
|
|
119
|
+
try {
|
|
120
|
+
execFileSync('sh', ['-c', buildCommand], { cwd: worktreeDir, stdio: 'pipe', timeout: 120_000 });
|
|
121
|
+
}
|
|
122
|
+
catch {
|
|
123
|
+
out(` ${c.red('✗')} Build failed in worktree — aborting.\n`);
|
|
124
|
+
cleanup(projectDir, worktreeDir);
|
|
125
|
+
return emptyResult(startedAt, branchName, worktreeDir, 'complete');
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
// Baseline test — run in worktree to establish the failure count
|
|
129
|
+
// Some projects have flaky tests or env-dependent failures in worktrees
|
|
130
|
+
out(` ${c.dim('Running baseline tests...')}\n`);
|
|
131
|
+
let baselineFailCount = 0;
|
|
132
|
+
try {
|
|
133
|
+
execFileSync('sh', ['-c', testCommand], { cwd: worktreeDir, stdio: 'pipe', timeout: 300_000 });
|
|
134
|
+
out(` ${c.green('✓')} Baseline tests pass\n\n`);
|
|
135
|
+
}
|
|
136
|
+
catch (err) {
|
|
137
|
+
// Count failures and extract names from vitest output
|
|
138
|
+
const output = err.stdout?.toString() ?? '';
|
|
139
|
+
const stderrOutput = err.stderr?.toString() ?? '';
|
|
140
|
+
const failMatch = output.match(/(\d+) failed/);
|
|
141
|
+
baselineFailCount = failMatch ? parseInt(failMatch[1], 10) : 0;
|
|
142
|
+
// Extract failing test file names for diagnostics
|
|
143
|
+
const failedFiles = (output + stderrOutput).match(/FAIL\s+\S+/g)?.slice(0, 10) ?? [];
|
|
144
|
+
if (baselineFailCount <= 5) {
|
|
145
|
+
out(` ${c.yellow('⚠')} Baseline: ${baselineFailCount} pre-existing failure(s) — will tolerate these\n`);
|
|
146
|
+
if (failedFiles.length > 0) {
|
|
147
|
+
for (const f of failedFiles)
|
|
148
|
+
out(` ${c.dim(f)}\n`);
|
|
149
|
+
}
|
|
150
|
+
out('\n');
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
out(` ${c.red('✗')} Baseline: ${baselineFailCount} failures — too many, fix them first.\n`);
|
|
154
|
+
if (failedFiles.length > 0) {
|
|
155
|
+
for (const f of failedFiles)
|
|
156
|
+
out(` ${c.dim(f)}\n`);
|
|
157
|
+
}
|
|
158
|
+
cleanup(projectDir, worktreeDir);
|
|
159
|
+
return emptyResult(startedAt, branchName, worktreeDir, 'complete');
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
// Load steering configuration
|
|
163
|
+
const { SteeringEngine, loadSteers, IMPROVE_STEERS } = await import('./steering-engine.js');
|
|
164
|
+
const steers = loadSteers(projectDir, IMPROVE_STEERS);
|
|
165
|
+
// Main loop
|
|
166
|
+
for (let cycle = 1; maxCycles === 0 || cycle <= maxCycles; cycle++) {
|
|
167
|
+
if (consecutiveFailures >= maxConsecutiveFailures) {
|
|
168
|
+
out(` ${c.yellow('⚠')} Stopping: ${maxConsecutiveFailures} consecutive failures.\n`);
|
|
169
|
+
break;
|
|
170
|
+
}
|
|
171
|
+
out(` ${c.bold(`--- Cycle ${cycle}/${maxCycles === 0 ? '∞' : maxCycles} ---`)}\n`);
|
|
172
|
+
emitEvent('improve:cycle_start', { cycle, maxCycles });
|
|
173
|
+
const cycleEngine = new SteeringEngine(steers);
|
|
174
|
+
// Record HEAD at cycle start to detect if assistant commits during its turn
|
|
175
|
+
let headAtCycleStart = '';
|
|
176
|
+
try {
|
|
177
|
+
headAtCycleStart = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: worktreeDir, encoding: 'utf-8' }).trim();
|
|
178
|
+
}
|
|
179
|
+
catch { /* not a git repo? */ }
|
|
180
|
+
// Build context: read the plan and extract top priority
|
|
181
|
+
let planContext = '';
|
|
182
|
+
try {
|
|
183
|
+
const planPath = path.join(worktreeDir, '.weaver-plan.md');
|
|
184
|
+
if (fs.existsSync(planPath)) {
|
|
185
|
+
const planContent = fs.readFileSync(planPath, 'utf-8');
|
|
186
|
+
// Extract the first priority section (### 0. or ### 1.)
|
|
187
|
+
const priorityMatch = planContent.match(/### 0\.[^\n]*\n([\s\S]*?)(?=\n### \d|$)/);
|
|
188
|
+
if (priorityMatch) {
|
|
189
|
+
planContext = `\n\nTOP PRIORITY FROM PROJECT PLAN — you MUST work on this:\n${priorityMatch[0].trim()}\n\nDo NOT work on anything else until the top priority is complete.`;
|
|
190
|
+
}
|
|
191
|
+
else {
|
|
192
|
+
// Fall back to the full priorities section
|
|
193
|
+
const prioritiesMatch = planContent.match(/## Current Priorities[\s\S]*?(?=\n## [A-Z]|$)/);
|
|
194
|
+
if (prioritiesMatch) {
|
|
195
|
+
planContext = `\n\nPROJECT PLAN PRIORITIES:\n${prioritiesMatch[0].slice(0, 1500)}`;
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
catch { /* no plan */ }
|
|
201
|
+
const workLog = completedWork.length > 0
|
|
202
|
+
? `\nALREADY DONE (do NOT repeat): ${completedWork.join('; ')}`
|
|
203
|
+
: '';
|
|
204
|
+
// Step 1: Find and fix in one turn
|
|
205
|
+
const improveMsg = `You are working in: ${worktreeDir}
|
|
206
|
+
|
|
207
|
+
Work on the TOP PRIORITY from the project plan. If no specific priority, find ONE small improvement. Steps:
|
|
208
|
+
1. Recall what you know: knowledge_search "project"
|
|
209
|
+
2. Read .weaver-plan.md to understand the top priority
|
|
210
|
+
3. Do exactly what the top priority says — one handler migration, one fix, one concrete step
|
|
211
|
+
4. Write a failing test first, then implement
|
|
212
|
+
5. Run tests to verify
|
|
213
|
+
4. Run tests with run_tests to verify
|
|
214
|
+
5. Store any insights with learn()
|
|
215
|
+
|
|
216
|
+
Keep changes to 1-3 files. All paths relative to ${worktreeDir}.${planContext}${workLog}`;
|
|
217
|
+
let conversationId = '';
|
|
218
|
+
let discovery = '';
|
|
219
|
+
try {
|
|
220
|
+
const raw = await runAssistantInDir(worktreeDir, improveMsg, '', cycleEngine);
|
|
221
|
+
const parsed = JSON.parse(raw);
|
|
222
|
+
conversationId = String(parsed.conversationId ?? '');
|
|
223
|
+
discovery = String(parsed.response ?? '');
|
|
224
|
+
}
|
|
225
|
+
catch (err) {
|
|
226
|
+
const msg = err instanceof Error ? err.message : '';
|
|
227
|
+
out(` ${c.dim(`Skip: ${msg.includes('timeout') ? 'timed out' : 'no response'}`)}\n`);
|
|
228
|
+
rollback(worktreeDir);
|
|
229
|
+
cycles.push({ cycle, outcome: 'skip', description: msg.includes('timeout') ? 'Timed out' : 'No response', filesChanged: [] });
|
|
230
|
+
continue;
|
|
231
|
+
}
|
|
232
|
+
// Stage all work immediately so it's recoverable even if the cycle doesn't complete
|
|
233
|
+
try {
|
|
234
|
+
execFileSync('git', ['add', '--all'], { cwd: worktreeDir, stdio: 'pipe' });
|
|
235
|
+
}
|
|
236
|
+
catch { /* non-fatal */ }
|
|
237
|
+
out(` ${c.dim('Done:')} ${discovery.split('\n')[0]?.slice(0, 80)}\n`);
|
|
238
|
+
// Check steering engine after initial assistant call
|
|
239
|
+
{
|
|
240
|
+
const steerMsg = cycleEngine.check();
|
|
241
|
+
if (steerMsg) {
|
|
242
|
+
out(` ${c.dim(steerMsg.replace(/\[.*?\]\s*/g, ''))}\n`);
|
|
243
|
+
}
|
|
244
|
+
if (cycleEngine.hasHardStop()) {
|
|
245
|
+
cycles.push({ cycle, outcome: 'skip', description: 'Hard stop from steering engine', filesChanged: [] });
|
|
246
|
+
break;
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
if (/^(nothing to improve|no issues found|all good|clean bill of health|i can.t find any|couldn.t find any|no improvements needed)/im.test(discovery)) {
|
|
250
|
+
out(` ${c.green('✓')} Nothing more to improve.\n`);
|
|
251
|
+
cycles.push({ cycle, outcome: 'skip', description: 'Nothing to improve', filesChanged: [] });
|
|
252
|
+
break;
|
|
253
|
+
}
|
|
254
|
+
// Step 2: Iterative test-fix loop (like a developer would)
|
|
255
|
+
// Steering engine controls cycle duration — hard stop is the safety valve
|
|
256
|
+
const cycleStart = Date.now();
|
|
257
|
+
let testsPassing = false;
|
|
258
|
+
let attempt = 0;
|
|
259
|
+
while (!cycleEngine.hasHardStop()) {
|
|
260
|
+
attempt++;
|
|
261
|
+
const changedFiles = getChangedFiles(worktreeDir);
|
|
262
|
+
if (changedFiles.length === 0) {
|
|
263
|
+
out(` ${c.dim('Skip: no files changed')}\n`);
|
|
264
|
+
break;
|
|
265
|
+
}
|
|
266
|
+
// Check protected files
|
|
267
|
+
const blocked = changedFiles.find(f => isProtected(f, protectedPatterns));
|
|
268
|
+
if (blocked) {
|
|
269
|
+
out(` ${c.yellow('⚠')} Blocked: modified protected file ${blocked}\n`);
|
|
270
|
+
break;
|
|
271
|
+
}
|
|
272
|
+
// Build if needed
|
|
273
|
+
if (buildCommand) {
|
|
274
|
+
try {
|
|
275
|
+
execFileSync('sh', ['-c', buildCommand], { cwd: worktreeDir, stdio: 'pipe', timeout: 120_000 });
|
|
276
|
+
}
|
|
277
|
+
catch {
|
|
278
|
+
out(` ${c.red('✗')} Build failed (attempt ${attempt})\n`);
|
|
279
|
+
if (cycleEngine.hasHardStop())
|
|
280
|
+
break;
|
|
281
|
+
// Ask assistant to fix build errors
|
|
282
|
+
try {
|
|
283
|
+
const fixRaw = await runAssistantInDir(worktreeDir, `Build failed. Fix the build errors. You are working in: ${worktreeDir}`, conversationId, cycleEngine);
|
|
284
|
+
const fixParsed = JSON.parse(fixRaw);
|
|
285
|
+
conversationId = String(fixParsed.conversationId ?? conversationId);
|
|
286
|
+
}
|
|
287
|
+
catch {
|
|
288
|
+
break;
|
|
289
|
+
}
|
|
290
|
+
continue;
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
// Run tests
|
|
294
|
+
out(` ${c.dim(`Testing (attempt ${attempt})...`)}\n`);
|
|
295
|
+
try {
|
|
296
|
+
execFileSync('sh', ['-c', testCommand], { cwd: worktreeDir, stdio: 'pipe', timeout: 300_000 });
|
|
297
|
+
cycleEngine.recordEvent('test_pass');
|
|
298
|
+
testsPassing = true;
|
|
299
|
+
break;
|
|
300
|
+
}
|
|
301
|
+
catch (testErr) {
|
|
302
|
+
cycleEngine.recordEvent('test_fail');
|
|
303
|
+
const testOutput = (testErr.stdout?.toString() ?? '');
|
|
304
|
+
const failMatch = testOutput.match(/(\d+) failed/);
|
|
305
|
+
const newFailCount = failMatch ? parseInt(failMatch[1], 10) : 999;
|
|
306
|
+
if (newFailCount <= baselineFailCount) {
|
|
307
|
+
out(` ${c.yellow('⚠')} Same pre-existing failures (${newFailCount}) — accepting\n`);
|
|
308
|
+
testsPassing = true;
|
|
309
|
+
break;
|
|
310
|
+
}
|
|
311
|
+
out(` ${c.red('✗')} ${newFailCount} failures (${newFailCount - baselineFailCount} new)\n`);
|
|
312
|
+
// Check steering engine for nudges
|
|
313
|
+
{
|
|
314
|
+
const steerMsg = cycleEngine.check();
|
|
315
|
+
if (steerMsg) {
|
|
316
|
+
out(` ${c.dim(steerMsg.replace(/\[.*?\]\s*/g, ''))}\n`);
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
const elapsed = Math.round((Date.now() - cycleStart) / 1000);
|
|
320
|
+
if (cycleEngine.hasHardStop()) {
|
|
321
|
+
out(` ${c.red('✗')} Steering engine hard stop (${elapsed}s) — rollback\n`);
|
|
322
|
+
break;
|
|
323
|
+
}
|
|
324
|
+
// Extract failing test names for the assistant
|
|
325
|
+
const failedTests = testOutput.match(/FAIL .+/g)?.slice(0, 5).join('\n') ?? 'unknown failures';
|
|
326
|
+
// Ask assistant to fix the test failures — same conversation, it has context
|
|
327
|
+
out(` ${c.dim(`Fixing failures (attempt ${attempt + 1})...`)}\n`);
|
|
328
|
+
try {
|
|
329
|
+
const fixMsg = `Tests failed with ${newFailCount - baselineFailCount} new failures. Fix them. You are working in: ${worktreeDir}
|
|
330
|
+
|
|
331
|
+
Failing tests:
|
|
332
|
+
${failedTests}
|
|
333
|
+
|
|
334
|
+
Fix the failures without reverting your improvement. If you can't fix them, revert only the parts that broke tests.`;
|
|
335
|
+
const fixRaw = await runAssistantInDir(worktreeDir, fixMsg, conversationId, cycleEngine);
|
|
336
|
+
const fixParsed = JSON.parse(fixRaw);
|
|
337
|
+
conversationId = String(fixParsed.conversationId ?? conversationId);
|
|
338
|
+
// Stage work immediately after each fix attempt
|
|
339
|
+
try {
|
|
340
|
+
execFileSync('git', ['add', '--all'], { cwd: worktreeDir, stdio: 'pipe' });
|
|
341
|
+
}
|
|
342
|
+
catch { /* non-fatal */ }
|
|
343
|
+
}
|
|
344
|
+
catch {
|
|
345
|
+
out(` ${c.dim('Fix attempt timed out')}\n`);
|
|
346
|
+
break;
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
// Check if the assistant already committed (the test_pass steer tells it to commit immediately)
|
|
351
|
+
try {
|
|
352
|
+
const headNow = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: worktreeDir, encoding: 'utf-8' }).trim();
|
|
353
|
+
if (headAtCycleStart && headNow !== headAtCycleStart) {
|
|
354
|
+
// HEAD moved — assistant committed during its turn
|
|
355
|
+
const newCommits = execFileSync('git', ['log', '--oneline', `${headAtCycleStart}..HEAD`], { cwd: worktreeDir, encoding: 'utf-8' }).trim();
|
|
356
|
+
const commitHash = execFileSync('git', ['rev-parse', '--short', 'HEAD'], { cwd: worktreeDir, encoding: 'utf-8' }).trim();
|
|
357
|
+
const commitMsg = execFileSync('git', ['log', '-1', '--format=%s'], { cwd: worktreeDir, encoding: 'utf-8' }).trim();
|
|
358
|
+
const commitCount = newCommits.split('\n').filter(Boolean).length;
|
|
359
|
+
out(` ${c.green('✓')} ${c.dim(commitHash)} (${commitCount} commit${commitCount > 1 ? 's' : ''} by assistant)\n\n`);
|
|
360
|
+
emitEvent('improve:commit', { cycle, commitHash, description: commitMsg.slice(0, 70) });
|
|
361
|
+
cycles.push({ cycle, outcome: 'success', description: commitMsg.slice(0, 70), filesChanged: [], commitHash });
|
|
362
|
+
completedWork.push(commitMsg.slice(0, 80));
|
|
363
|
+
consecutiveFailures = 0;
|
|
364
|
+
continue;
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
catch { /* git check failed — fall through to normal flow */ }
|
|
368
|
+
if (!testsPassing) {
|
|
369
|
+
// Record what was attempted so next cycle can learn from it
|
|
370
|
+
const failSummary = discovery.split('\n').filter(l => l.trim()).slice(0, 2).join(' ').slice(0, 100);
|
|
371
|
+
completedWork.push(`FAILED: ${failSummary} (tests broke, rolled back — try a different approach)`);
|
|
372
|
+
rollback(worktreeDir);
|
|
373
|
+
const elapsed = Math.round((Date.now() - cycleStart) / 1000);
|
|
374
|
+
cycles.push({ cycle, outcome: 'failure', description: `Tests failed after ${attempt} attempts (${elapsed}s)`, filesChanged: getChangedFiles(worktreeDir) });
|
|
375
|
+
consecutiveFailures++;
|
|
376
|
+
continue;
|
|
377
|
+
}
|
|
378
|
+
// Step 7: Commit in worktree (exclude symlinks and node_modules)
|
|
379
|
+
try {
|
|
380
|
+
// Stage all changes
|
|
381
|
+
execFileSync('git', ['add', '--all'], { cwd: worktreeDir, stdio: 'pipe' });
|
|
382
|
+
// Check if there's actually anything staged
|
|
383
|
+
const staged = execFileSync('git', ['diff', '--cached', '--name-only'], { cwd: worktreeDir, encoding: 'utf-8' }).trim();
|
|
384
|
+
if (!staged) {
|
|
385
|
+
out(` ${c.dim('Skip: assistant made no file changes')}\n\n`);
|
|
386
|
+
cycles.push({ cycle, outcome: 'skip', description: 'No staged changes after fix', filesChanged: [] });
|
|
387
|
+
continue;
|
|
388
|
+
}
|
|
389
|
+
// Build commit message from staged files + discovery text
|
|
390
|
+
const stagedFiles = staged.split('\n').filter(Boolean);
|
|
391
|
+
const srcFiles = stagedFiles.filter(f => f.startsWith('src/')).map(f => path.basename(f, '.ts'));
|
|
392
|
+
const testFiles = stagedFiles.filter(f => f.startsWith('tests/') || f.includes('.test.'));
|
|
393
|
+
const fileNames = srcFiles.length > 0 ? srcFiles.join(', ') : stagedFiles.map(f => path.basename(f, '.ts')).join(', ');
|
|
394
|
+
const descLine = discovery
|
|
395
|
+
.split('\n')
|
|
396
|
+
.map(l => l.trim())
|
|
397
|
+
.filter(l => l.length > 15)
|
|
398
|
+
.filter(l => !/^(here|let me|i found|i'll|looking|checking|reading|good$|now |you are|step \d|important|first|use )/i.test(l))
|
|
399
|
+
.map(l => l.replace(/^\*\*|^\d+\.\s*|\*\*$|^[-•]\s*/g, '').trim())
|
|
400
|
+
.find(l => /test|cover|fix|add|miss|error|handl|improv|bug|reliab|word.bound/i.test(l)) ?? '';
|
|
401
|
+
const commitDescription = descLine
|
|
402
|
+
? descLine.slice(0, 60)
|
|
403
|
+
: testFiles.length > 0
|
|
404
|
+
? `add tests for ${fileNames}`.slice(0, 60)
|
|
405
|
+
: `improve ${fileNames}`.slice(0, 60);
|
|
406
|
+
const commitMsg = `[improve] ${commitDescription}`;
|
|
407
|
+
execFileSync('git', ['commit', '-m', `${commitMsg}\n\nCo-authored-by: Weaver Assistant <weaver@synergenius.dev>`], { cwd: worktreeDir, stdio: 'pipe' });
|
|
408
|
+
const hash = execFileSync('git', ['rev-parse', '--short', 'HEAD'], { cwd: worktreeDir, encoding: 'utf-8' }).trim();
|
|
409
|
+
out(` ${c.green('✓')} ${c.dim(hash)} ${commitMsg}\n\n`);
|
|
410
|
+
emitEvent('improve:commit', { cycle, commitHash: hash, description: commitDescription });
|
|
411
|
+
cycles.push({ cycle, outcome: 'success', description: commitDescription, filesChanged: stagedFiles, commitHash: hash });
|
|
412
|
+
completedWork.push(`${commitDescription} (${stagedFiles.join(', ')})`);
|
|
413
|
+
consecutiveFailures = 0;
|
|
414
|
+
}
|
|
415
|
+
catch (err) {
|
|
416
|
+
out(` ${c.red('✗')} Commit failed: ${err instanceof Error ? err.message.split('\n')[0] : 'unknown'}\n`);
|
|
417
|
+
rollback(worktreeDir);
|
|
418
|
+
cycles.push({ cycle, outcome: 'failure', description: 'Commit failed', filesChanged: getChangedFiles(worktreeDir), error: String(err) });
|
|
419
|
+
consecutiveFailures++;
|
|
420
|
+
}
|
|
421
|
+
}
|
|
422
|
+
const result = {
|
|
423
|
+
totalCycles: cycles.length,
|
|
424
|
+
successes: cycles.filter(cy => cy.outcome === 'success').length,
|
|
425
|
+
failures: cycles.filter(cy => cy.outcome === 'failure').length,
|
|
426
|
+
skips: cycles.filter(cy => cy.outcome === 'skip').length,
|
|
427
|
+
blocked: cycles.filter(cy => cy.outcome === 'blocked').length,
|
|
428
|
+
cycles,
|
|
429
|
+
startedAt,
|
|
430
|
+
finishedAt: new Date().toISOString(),
|
|
431
|
+
branch: branchName,
|
|
432
|
+
worktreePath: worktreeDir,
|
|
433
|
+
reason: consecutiveFailures >= maxConsecutiveFailures ? 'max-failures'
|
|
434
|
+
: cycles.some(cy => cy.description === 'Nothing to improve') ? 'nothing-to-improve'
|
|
435
|
+
: 'max-cycles',
|
|
436
|
+
};
|
|
437
|
+
// Release sleep inhibitor
|
|
438
|
+
if (caffeinate) {
|
|
439
|
+
try {
|
|
440
|
+
caffeinate.kill();
|
|
441
|
+
}
|
|
442
|
+
catch { /* already dead */ }
|
|
443
|
+
}
|
|
444
|
+
// Emit completion event
|
|
445
|
+
emitEvent('improve:complete', { successes: cycles.filter(cy => cy.outcome === 'success').length, failures: cycles.filter(cy => cy.outcome === 'failure').length, totalCycles: cycles.length });
|
|
446
|
+
// Summary
|
|
447
|
+
out(`\n ${c.bold('=== Improve Complete ===')}\n`);
|
|
448
|
+
out(` ${result.successes} committed, ${result.failures} rolled back, ${result.skips} skipped, ${result.blocked} blocked\n`);
|
|
449
|
+
out(` Branch: ${c.cyan(branchName)}\n`);
|
|
450
|
+
if (result.successes > 0) {
|
|
451
|
+
out(`\n ${c.bold('Commits:')}\n`);
|
|
452
|
+
for (const cy of cycles.filter(cy => cy.outcome === 'success')) {
|
|
453
|
+
out(` ${c.green(cy.commitHash)} ${cy.description}\n`);
|
|
454
|
+
}
|
|
455
|
+
out(`\n Review: ${c.cyan(`git log main..${branchName}`)}\n`);
|
|
456
|
+
out(` Merge: ${c.cyan(`git merge ${branchName}`)}\n`);
|
|
457
|
+
}
|
|
458
|
+
if (result.successes === 0) {
|
|
459
|
+
out(`\n No changes made. Cleaning up worktree.\n`);
|
|
460
|
+
cleanup(projectDir, worktreeDir);
|
|
461
|
+
}
|
|
462
|
+
else {
|
|
463
|
+
out(`\n ${c.dim(`Worktree kept at: ${path.relative(projectDir, worktreeDir)}`)}\n`);
|
|
464
|
+
out(` ${c.dim(`Clean up: git worktree remove ${path.relative(projectDir, worktreeDir)}`)}\n`);
|
|
465
|
+
}
|
|
466
|
+
out('\n');
|
|
467
|
+
// Persist summary
|
|
468
|
+
try {
|
|
469
|
+
const summaryDir = path.join(os.homedir(), '.weaver', 'improve');
|
|
470
|
+
fs.mkdirSync(summaryDir, { recursive: true });
|
|
471
|
+
fs.writeFileSync(path.join(summaryDir, `run-${new Date().toISOString().replace(/[:.]/g, '-')}.json`), JSON.stringify(result, null, 2), 'utf-8');
|
|
472
|
+
}
|
|
473
|
+
catch { /* non-fatal */ }
|
|
474
|
+
return result;
|
|
475
|
+
}
|
|
476
|
+
function emptyResult(startedAt, branch, worktreePath, reason) {
|
|
477
|
+
return { totalCycles: 0, successes: 0, failures: 0, skips: 0, blocked: 0, cycles: [], startedAt, finishedAt: new Date().toISOString(), branch, worktreePath, reason };
|
|
478
|
+
}
|
|
479
|
+
// --- Helpers ---
|
|
480
|
+
let cachedProvider = null;
|
|
481
|
+
let cachedTools = [];
|
|
482
|
+
let cachedExecutor = null;
|
|
483
|
+
async function runAssistantInDir(worktreeDir, message, _conversationId, steeringEngine) {
|
|
484
|
+
const originalCwd = process.cwd();
|
|
485
|
+
process.chdir(worktreeDir);
|
|
486
|
+
try {
|
|
487
|
+
// Reuse provider across cycles (keeps Claude CLI subprocess alive)
|
|
488
|
+
if (!cachedProvider) {
|
|
489
|
+
const agentMod = await import('@synergenius/flow-weaver/agent');
|
|
490
|
+
const { ASSISTANT_TOOLS, createAssistantExecutor } = await import('./assistant-tools.js');
|
|
491
|
+
cachedTools = ASSISTANT_TOOLS;
|
|
492
|
+
cachedExecutor = createAssistantExecutor(worktreeDir, steeringEngine);
|
|
493
|
+
if (process.env.ANTHROPIC_API_KEY) {
|
|
494
|
+
cachedProvider = agentMod.createAnthropicProvider({
|
|
495
|
+
apiKey: process.env.ANTHROPIC_API_KEY,
|
|
496
|
+
});
|
|
497
|
+
}
|
|
498
|
+
else {
|
|
499
|
+
// Disable Claude CLI's built-in file tools so it uses our MCP-bridged
|
|
500
|
+
// tools which respect projectDir (critical for worktree isolation)
|
|
501
|
+
cachedProvider = agentMod.createClaudeCliProvider({
|
|
502
|
+
cwd: worktreeDir,
|
|
503
|
+
disallowedTools: ['Read', 'Edit', 'Write', 'MultiEdit'],
|
|
504
|
+
});
|
|
505
|
+
}
|
|
506
|
+
}
|
|
507
|
+
const { runAgentLoop } = await import('@synergenius/flow-weaver/agent');
|
|
508
|
+
let responseText = '';
|
|
509
|
+
const toolCalls = [];
|
|
510
|
+
const result = await runAgentLoop(cachedProvider, cachedTools, cachedExecutor, [{ role: 'user', content: message }], {
|
|
511
|
+
maxIterations: 20,
|
|
512
|
+
onStreamEvent: (e) => {
|
|
513
|
+
if (e.type === 'text_delta') {
|
|
514
|
+
responseText += e.text;
|
|
515
|
+
process.stderr.write(e.text);
|
|
516
|
+
}
|
|
517
|
+
},
|
|
518
|
+
onToolEvent: (e) => {
|
|
519
|
+
if (e.type === 'tool_call_start') {
|
|
520
|
+
process.stderr.write(`\n ${e.name} `);
|
|
521
|
+
}
|
|
522
|
+
if (e.type === 'tool_call_result') {
|
|
523
|
+
toolCalls.push({ name: e.name ?? '', isError: !!e.isError });
|
|
524
|
+
process.stderr.write(e.isError ? '✗ ' : '✓ ');
|
|
525
|
+
}
|
|
526
|
+
},
|
|
527
|
+
});
|
|
528
|
+
return JSON.stringify({
|
|
529
|
+
response: responseText,
|
|
530
|
+
toolCalls,
|
|
531
|
+
tokensUsed: result.usage.promptTokens + result.usage.completionTokens,
|
|
532
|
+
});
|
|
533
|
+
}
|
|
534
|
+
finally {
|
|
535
|
+
process.chdir(originalCwd);
|
|
536
|
+
}
|
|
537
|
+
}
|
|
538
|
+
function getChangedFiles(dir) {
|
|
539
|
+
try {
|
|
540
|
+
const modified = execFileSync('git', ['diff', '--name-only'], { cwd: dir, encoding: 'utf-8' }).trim();
|
|
541
|
+
const untracked = execFileSync('git', ['ls-files', '--others', '--exclude-standard'], { cwd: dir, encoding: 'utf-8' }).trim();
|
|
542
|
+
return [...modified.split('\n'), ...untracked.split('\n')]
|
|
543
|
+
.filter(Boolean)
|
|
544
|
+
.filter(f => !f.startsWith('node_modules') && !f.includes('/node_modules/'));
|
|
545
|
+
}
|
|
546
|
+
catch {
|
|
547
|
+
return [];
|
|
548
|
+
}
|
|
549
|
+
}
|
|
550
|
+
function rollback(dir) {
|
|
551
|
+
try {
|
|
552
|
+
execFileSync('git', ['checkout', '.'], { cwd: dir, stdio: 'pipe' });
|
|
553
|
+
execFileSync('git', ['clean', '-fd'], { cwd: dir, stdio: 'pipe' });
|
|
554
|
+
}
|
|
555
|
+
catch { /* best effort */ }
|
|
556
|
+
}
|
|
557
|
+
function cleanup(projectDir, worktreeDir) {
|
|
558
|
+
// Safety: stash any staged work before removing worktree so blobs survive in git
|
|
559
|
+
try {
|
|
560
|
+
const staged = execFileSync('git', ['diff', '--cached', '--name-only'], { cwd: worktreeDir, encoding: 'utf-8' }).trim();
|
|
561
|
+
if (staged) {
|
|
562
|
+
execFileSync('git', ['stash', 'push', '-m', `weaver-improve: work-in-progress (${staged.split('\n').length} files)`], { cwd: worktreeDir, stdio: 'pipe' });
|
|
563
|
+
}
|
|
564
|
+
}
|
|
565
|
+
catch { /* stash failed — work may be lost but at least blobs are in git objects if staged */ }
|
|
566
|
+
try {
|
|
567
|
+
execFileSync('git', ['worktree', 'remove', worktreeDir, '--force'], { cwd: projectDir, stdio: 'pipe' });
|
|
568
|
+
}
|
|
569
|
+
catch { /* best effort */ }
|
|
570
|
+
try {
|
|
571
|
+
const parent = path.dirname(worktreeDir);
|
|
572
|
+
if (fs.existsSync(parent) && fs.readdirSync(parent).length === 0) {
|
|
573
|
+
fs.rmdirSync(parent);
|
|
574
|
+
}
|
|
575
|
+
}
|
|
576
|
+
catch { /* best effort */ }
|
|
577
|
+
}
|
|
578
|
+
function isProtected(file, patterns) {
|
|
579
|
+
for (const pattern of patterns) {
|
|
580
|
+
const regex = new RegExp('^' + pattern
|
|
581
|
+
.replace(/\./g, '\\.')
|
|
582
|
+
.replace(/\*\*/g, '{{DS}}')
|
|
583
|
+
.replace(/\*/g, '[^/]*')
|
|
584
|
+
.replace(/\{\{DS\}\}/g, '.*')
|
|
585
|
+
+ '$');
|
|
586
|
+
if (regex.test(file))
|
|
587
|
+
return true;
|
|
588
|
+
}
|
|
589
|
+
return false;
|
|
590
|
+
}
|
|
591
|
+
export { DEFAULT_PROTECTED };
|
|
592
|
+
//# sourceMappingURL=improve-loop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"improve-loop.js","sourceRoot":"","sources":["../../src/bot/improve-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/bot/index.d.ts
CHANGED
|
@@ -23,6 +23,7 @@ export { DashboardServer } from './dashboard.js';
|
|
|
23
23
|
export { openBrowser } from './utils.js';
|
|
24
24
|
export { WebApprovalHandler } from './web-approval.js';
|
|
25
25
|
export { GenesisStore } from './genesis-store.js';
|
|
26
|
+
export { ProjectModelStore } from './project-model.js';
|
|
26
27
|
export { withFileLock } from './file-lock.js';
|
|
27
28
|
export type { FileLockOptions } from './file-lock.js';
|
|
28
29
|
export { safeJsonParse, jsonParseOr, parseNdjson } from './safe-json.js';
|