karajan-code 1.56.0 → 1.57.2
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/README.md +9 -2
- package/docs/README.es.md +9 -2
- package/package.json +1 -1
- package/scripts/ai-attribution-guard.yml +77 -0
- package/scripts/esbuild-sea.config.mjs +83 -15
- package/scripts/install-guard-all-repos.sh +85 -0
- package/scripts/protect-all-repos.sh +88 -0
- package/src/bootstrap.js +8 -4
- package/src/cli.js +6 -0
- package/src/commands/init.js +41 -0
- package/src/config.js +20 -6
- package/src/mcp/error-classifiers.js +66 -0
- package/src/mcp/handlers/direct-handlers.js +1 -1
- package/src/mcp/handlers/hu-handlers.js +1 -1
- package/src/mcp/handlers/management-handlers.js +1 -1
- package/src/mcp/handlers/run-handler.js +6 -4
- package/src/mcp/orphan-guard.js +41 -4
- package/src/mcp/server-handlers.js +44 -229
- package/src/mcp/server.js +8 -1
- package/src/mcp/shared-helpers.js +144 -0
- package/src/orchestrator/preflight-checks.js +16 -5
- package/src/orchestrator.js +14 -0
- package/src/utils/process.js +4 -0
- package/src/utils/telemetry.js +47 -0
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
failPayload,
|
|
14
14
|
responseText,
|
|
15
15
|
buildConfig,
|
|
16
|
-
} from "../
|
|
16
|
+
} from "../shared-helpers.js";
|
|
17
17
|
import { buildDashboardJson } from "../../utils/status-dashboard.js";
|
|
18
18
|
import { loadMostRecentSession } from "../../session-store.js";
|
|
19
19
|
|
|
@@ -21,7 +21,7 @@ import {
|
|
|
21
21
|
buildConfig,
|
|
22
22
|
buildAskQuestion,
|
|
23
23
|
enrichedFailPayload,
|
|
24
|
-
} from "../
|
|
24
|
+
} from "../shared-helpers.js";
|
|
25
25
|
|
|
26
26
|
const MAX_AUTO_RESUMES = 2;
|
|
27
27
|
const NON_RECOVERABLE_CATEGORIES = new Set([
|
|
@@ -154,8 +154,10 @@ export async function handleRunDirect(a, server, extra) {
|
|
|
154
154
|
}
|
|
155
155
|
|
|
156
156
|
export async function handleResumeDirect(a, server, extra) {
|
|
157
|
-
|
|
158
|
-
|
|
157
|
+
// Use a minimal config only for the logger; let resumeFlow use the session's
|
|
158
|
+
// config_snapshot so that flags like --no-sonar from the original run are preserved.
|
|
159
|
+
const freshConfig = await buildConfig(a);
|
|
160
|
+
const logger = createLogger(freshConfig.output.log_level, "mcp");
|
|
159
161
|
|
|
160
162
|
const projectDir = await resolveProjectDir(server, a.projectDir);
|
|
161
163
|
const runLog = createRunLog(projectDir);
|
|
@@ -172,7 +174,7 @@ export async function handleResumeDirect(a, server, extra) {
|
|
|
172
174
|
const result = await resumeFlow({
|
|
173
175
|
sessionId: a.sessionId,
|
|
174
176
|
answer: a.answer || null,
|
|
175
|
-
config,
|
|
177
|
+
config: null, // Use session.config_snapshot (preserves --no-sonar, etc.)
|
|
176
178
|
logger,
|
|
177
179
|
flags: a,
|
|
178
180
|
emitter,
|
package/src/mcp/orphan-guard.js
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import { readFileSync, watch } from "node:fs";
|
|
1
|
+
import { readFileSync, writeFileSync, unlinkSync, watch, mkdirSync, existsSync } from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import os from "node:os";
|
|
4
|
+
|
|
5
|
+
const RESTART_MARKER_DIR = path.join(os.homedir(), ".kj");
|
|
6
|
+
const RESTART_MARKER_PATH = path.join(RESTART_MARKER_DIR, ".mcp-restart");
|
|
2
7
|
|
|
3
8
|
const DEFAULT_INTERVAL_MS = 5000;
|
|
4
9
|
|
|
@@ -69,14 +74,46 @@ export function setupMemoryWatchdog({
|
|
|
69
74
|
return { timer };
|
|
70
75
|
}
|
|
71
76
|
|
|
72
|
-
|
|
77
|
+
const DEFAULT_GRACE_MS = 2000;
|
|
78
|
+
|
|
79
|
+
export function writeRestartMarker(version, markerPath = RESTART_MARKER_PATH) {
|
|
80
|
+
try {
|
|
81
|
+
mkdirSync(path.dirname(markerPath), { recursive: true });
|
|
82
|
+
writeFileSync(markerPath, version, "utf8");
|
|
83
|
+
} catch { /* best-effort */ }
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
export function readAndDeleteRestartMarker(markerPath = RESTART_MARKER_PATH) {
|
|
87
|
+
try {
|
|
88
|
+
if (!existsSync(markerPath)) return null;
|
|
89
|
+
const version = readFileSync(markerPath, "utf8").trim();
|
|
90
|
+
unlinkSync(markerPath);
|
|
91
|
+
return version || null;
|
|
92
|
+
} catch { /* ignore */ }
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
export function setupVersionWatcher({
|
|
97
|
+
pkgPath,
|
|
98
|
+
currentVersion,
|
|
99
|
+
gracePeriodMs = DEFAULT_GRACE_MS,
|
|
100
|
+
exitFn = () => process.exit(0),
|
|
101
|
+
markerPath = RESTART_MARKER_PATH
|
|
102
|
+
} = {}) {
|
|
73
103
|
if (!pkgPath) return null;
|
|
74
104
|
|
|
105
|
+
let _gracePeriodMs = gracePeriodMs;
|
|
106
|
+
|
|
75
107
|
function checkVersion() {
|
|
76
108
|
try {
|
|
77
109
|
const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
|
|
78
110
|
if (pkg.version !== currentVersion) {
|
|
79
|
-
|
|
111
|
+
const newVersion = pkg.version;
|
|
112
|
+
process.stderr.write(
|
|
113
|
+
`[karajan-mcp] Karajan MCP updated (v${currentVersion} → v${newVersion}). Restarting...\n`
|
|
114
|
+
);
|
|
115
|
+
writeRestartMarker(newVersion, markerPath);
|
|
116
|
+
setTimeout(() => exitFn(), _gracePeriodMs);
|
|
80
117
|
return true;
|
|
81
118
|
}
|
|
82
119
|
} catch { /* ignore read errors */ }
|
|
@@ -90,5 +127,5 @@ export function setupVersionWatcher({ pkgPath, currentVersion, exitFn = () => pr
|
|
|
90
127
|
});
|
|
91
128
|
} catch { /* ignore watch errors */ }
|
|
92
129
|
|
|
93
|
-
return { watcher, checkVersion };
|
|
130
|
+
return { watcher, checkVersion, get gracePeriodMs() { return _gracePeriodMs; }, set gracePeriodMs(v) { _gracePeriodMs = v; } };
|
|
94
131
|
}
|
|
@@ -1,16 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* MCP server handler logic.
|
|
3
|
-
* Shared helpers
|
|
4
|
-
*
|
|
3
|
+
* Shared helpers live in ./shared-helpers.js (to avoid circular imports).
|
|
4
|
+
* Handler implementations are in ./handlers/*.
|
|
5
|
+
* This module re-exports everything so existing imports continue to work.
|
|
5
6
|
*/
|
|
6
7
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
8
|
+
// ── Shared helpers (re-exported from shared-helpers.js) ──────────────
|
|
9
|
+
export {
|
|
10
|
+
resolveProjectDir,
|
|
11
|
+
asObject,
|
|
12
|
+
responseText,
|
|
13
|
+
failPayload,
|
|
14
|
+
assertNotOnBaseBranch,
|
|
15
|
+
enrichedFailPayload,
|
|
16
|
+
buildConfig,
|
|
17
|
+
buildAskQuestion,
|
|
18
|
+
buildDirectEmitter,
|
|
19
|
+
classifyError
|
|
20
|
+
} from "./shared-helpers.js";
|
|
14
21
|
|
|
15
22
|
// ── Sub-module re-exports ────────────────────────────────────────────
|
|
16
23
|
export { handleRunDirect, handleResumeDirect, validateResumeAnswer, handleRun, handleResume } from "./handlers/run-handler.js";
|
|
@@ -18,199 +25,9 @@ export { handlePlanDirect, handleCodeDirect, handleReviewDirect, handleDiscoverD
|
|
|
18
25
|
export { handleStatus, handleAgents, handlePreflight, handleRoles, handleReport, handleInit, handleDoctor, handleConfig, handleScan, handleBoard, handleUndo, buildPreflightRequiredResponse } from "./handlers/management-handlers.js";
|
|
19
26
|
export { handleHu, handleSkills, handleSuggest } from "./handlers/hu-handlers.js";
|
|
20
27
|
|
|
21
|
-
// ──
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* Resolve the user's project directory.
|
|
25
|
-
* Priority: 1) explicit projectDir param, 2) MCP roots, 3) error with instructions.
|
|
26
|
-
*/
|
|
27
|
-
export async function resolveProjectDir(server, explicitProjectDir) {
|
|
28
|
-
// 1. Explicit projectDir from tool parameter — always wins
|
|
29
|
-
if (explicitProjectDir) return explicitProjectDir;
|
|
30
|
-
|
|
31
|
-
// 2. MCP roots (host-provided workspace directory)
|
|
32
|
-
try {
|
|
33
|
-
const { roots } = await server.listRoots();
|
|
34
|
-
if (roots?.length > 0) {
|
|
35
|
-
const uri = roots[0].uri;
|
|
36
|
-
if (uri.startsWith("file://")) return new URL(uri).pathname;
|
|
37
|
-
return uri;
|
|
38
|
-
}
|
|
39
|
-
} catch { /* client may not support roots */ }
|
|
40
|
-
|
|
41
|
-
// 3. Check if process.cwd() looks like a real project (has package.json or .git)
|
|
42
|
-
const cwd = process.cwd();
|
|
43
|
-
try {
|
|
44
|
-
const hasGit = await fs.access(`${cwd}/.git`).then(() => true).catch(() => false);
|
|
45
|
-
const hasPkg = await fs.access(`${cwd}/package.json`).then(() => true).catch(() => false);
|
|
46
|
-
if (hasGit || hasPkg) return cwd;
|
|
47
|
-
} catch { /* ignore */ }
|
|
48
|
-
|
|
49
|
-
// 4. No valid project directory — fail with clear instructions
|
|
50
|
-
throw new Error(
|
|
51
|
-
`Cannot determine project directory. The MCP server is running from "${cwd}" which does not appear to be your project. ` +
|
|
52
|
-
`Fix: pass the "projectDir" parameter with the absolute path to your project (e.g., projectDir: "/home/user/my-project"), ` +
|
|
53
|
-
`or run "kj init" inside your project directory.`
|
|
54
|
-
);
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
export function asObject(value) {
|
|
58
|
-
if (value && typeof value === "object") return value;
|
|
59
|
-
return {};
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
export function responseText(payload) {
|
|
63
|
-
const compressed = compressResponse(payload);
|
|
64
|
-
return {
|
|
65
|
-
content: [{ type: "text", text: compactStringify(compressed) }]
|
|
66
|
-
};
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
export function failPayload(message, details = {}) {
|
|
70
|
-
return {
|
|
71
|
-
ok: false,
|
|
72
|
-
error: message,
|
|
73
|
-
...details
|
|
74
|
-
};
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
const ERROR_CLASSIFIERS = [
|
|
78
|
-
{
|
|
79
|
-
test: (lower) => lower.includes("without output") || lower.includes("silent for") || lower.includes("unresponsive") || lower.includes("exceeded max silence"),
|
|
80
|
-
category: "agent_stall",
|
|
81
|
-
suggestion: "Agent output stalled. Check live details with kj_status, then retry with a smaller prompt or increase session.max_agent_silence_minutes if needed."
|
|
82
|
-
},
|
|
83
|
-
{
|
|
84
|
-
test: (lower) => lower.includes("sonar") && (lower.includes("connect") || lower.includes("econnrefused") || lower.includes("not available") || lower.includes("not running")),
|
|
85
|
-
category: "sonar_unavailable",
|
|
86
|
-
suggestion: withDocLink("SonarQube is not reachable. Try: kj_init to set up SonarQube, or run 'docker start sonarqube' if already installed. Use --no-sonar to skip SonarQube.", "sonar_docker")
|
|
87
|
-
},
|
|
88
|
-
{
|
|
89
|
-
test: (lower) => lower.includes("401") || lower.includes("unauthorized") || lower.includes("invalid token"),
|
|
90
|
-
category: "auth_error",
|
|
91
|
-
suggestion: withDocLink("Authentication failed. Regenerate the SonarQube token and update it via kj_init or in ~/.karajan/kj.config.yml under sonarqube.token.", "sonar_token")
|
|
92
|
-
},
|
|
93
|
-
{
|
|
94
|
-
test: (lower) => lower.includes("config") && (lower.includes("missing") || lower.includes("not found") || lower.includes("invalid")),
|
|
95
|
-
category: "config_error",
|
|
96
|
-
suggestion: withDocLink("Configuration issue detected. Run kj_doctor to diagnose, or kj_init to create a fresh config.", "config_missing")
|
|
97
|
-
},
|
|
98
|
-
{
|
|
99
|
-
test: (lower) => lower.includes("missing provider") || lower.includes("not found") && (lower.includes("claude") || lower.includes("codex") || lower.includes("gemini") || lower.includes("aider")),
|
|
100
|
-
category: "agent_missing",
|
|
101
|
-
suggestion: withDocLink("Required agent CLI not found. Run kj_doctor to check which agents are installed and get installation instructions.", "agent_not_found")
|
|
102
|
-
},
|
|
103
|
-
{
|
|
104
|
-
test: (lower) => lower.includes("timed out") || lower.includes("timeout"),
|
|
105
|
-
category: "timeout",
|
|
106
|
-
suggestion: "The agent did not complete in time. Try: (1) increase --max-iteration-minutes (default: 5), (2) split the task into smaller pieces, (3) use kj_code for single-agent tasks. If a SonarQube scan timed out, check Docker health."
|
|
107
|
-
},
|
|
108
|
-
{
|
|
109
|
-
test: (lower) => lower.includes("you are on the base branch"),
|
|
110
|
-
category: "branch_error",
|
|
111
|
-
suggestion: withDocLink("Create a feature branch before running Karajan. Use 'git checkout -b feat/<task-description>' and then retry. Do NOT run kj_code directly on the base branch.", "branch_error")
|
|
112
|
-
},
|
|
113
|
-
{
|
|
114
|
-
test: (lower) => lower.includes("not a git repository"),
|
|
115
|
-
category: "git_error",
|
|
116
|
-
suggestion: "Current directory is not a git repository. Navigate to your project root or initialize git with 'git init'."
|
|
117
|
-
},
|
|
118
|
-
{
|
|
119
|
-
test: (lower) => lower.includes("bootstrap failed"),
|
|
120
|
-
category: "bootstrap_error",
|
|
121
|
-
suggestion: withDocLink("Environment prerequisites not met. Run kj_doctor for diagnostics, then fix the issues listed. Do NOT work around these — fix them properly.", "bootstrap_failed")
|
|
122
|
-
}
|
|
123
|
-
];
|
|
124
|
-
|
|
125
|
-
export function classifyError(error) {
|
|
126
|
-
const msg = error?.message || String(error);
|
|
127
|
-
const lower = msg.toLowerCase();
|
|
128
|
-
|
|
129
|
-
const match = ERROR_CLASSIFIERS.find(c => c.test(lower));
|
|
130
|
-
if (match) {
|
|
131
|
-
return { category: match.category, suggestion: match.suggestion };
|
|
132
|
-
}
|
|
133
|
-
return { category: "unknown", suggestion: null };
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
export async function assertNotOnBaseBranch(config) {
|
|
137
|
-
const baseBranch = config?.base_branch || "main";
|
|
138
|
-
let branch;
|
|
139
|
-
try {
|
|
140
|
-
branch = await currentBranch();
|
|
141
|
-
} catch {
|
|
142
|
-
return; // not a git repo or detached HEAD — let downstream handle it
|
|
143
|
-
}
|
|
144
|
-
if (branch === baseBranch) {
|
|
145
|
-
throw new Error(
|
|
146
|
-
`You are on the base branch '${baseBranch}'. Karajan needs a feature branch to compute the diff for review. ` +
|
|
147
|
-
`Create a new branch first (e.g. 'git checkout -b feat/<task-description>') and then run this command again. ` +
|
|
148
|
-
`Do NOT run kj_code directly — create the branch first so the full pipeline (code + review) works correctly.`
|
|
149
|
-
);
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
export function enrichedFailPayload(error, toolName) {
|
|
154
|
-
const msg = error?.message || String(error);
|
|
155
|
-
const { category, suggestion } = classifyError(error);
|
|
156
|
-
const payload = {
|
|
157
|
-
ok: false,
|
|
158
|
-
error: msg,
|
|
159
|
-
tool: toolName,
|
|
160
|
-
category
|
|
161
|
-
};
|
|
162
|
-
if (suggestion) payload.suggestion = suggestion;
|
|
163
|
-
return payload;
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
export async function buildConfig(options, commandName = "run") {
|
|
167
|
-
const { config } = await loadConfig();
|
|
168
|
-
const merged = applyRunOverrides(config, options || {});
|
|
169
|
-
validateConfig(merged, commandName);
|
|
170
|
-
return merged;
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
export function buildAskQuestion(server) {
|
|
174
|
-
return async (question) => {
|
|
175
|
-
try {
|
|
176
|
-
const result = await server.elicitInput({
|
|
177
|
-
message: question,
|
|
178
|
-
requestedSchema: {
|
|
179
|
-
type: "object",
|
|
180
|
-
properties: {
|
|
181
|
-
answer: { type: "string", description: "Your response" }
|
|
182
|
-
},
|
|
183
|
-
required: ["answer"]
|
|
184
|
-
}
|
|
185
|
-
});
|
|
186
|
-
return result.action === "accept" ? result.content?.answer || null : null;
|
|
187
|
-
} catch { /* elicitInput not supported by client */
|
|
188
|
-
return null;
|
|
189
|
-
}
|
|
190
|
-
};
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
const EVENT_LOG_LEVELS = {
|
|
194
|
-
"agent:stall": "warning",
|
|
195
|
-
"agent:heartbeat": "info"
|
|
196
|
-
};
|
|
197
|
-
|
|
198
|
-
export function buildDirectEmitter(server, runLog, extra) {
|
|
199
|
-
const emitter = new EventEmitter();
|
|
200
|
-
emitter.on("progress", (event) => {
|
|
201
|
-
try {
|
|
202
|
-
const level = EVENT_LOG_LEVELS[event.type] || "debug";
|
|
203
|
-
server.sendLoggingMessage({ level, logger: "karajan", data: event });
|
|
204
|
-
} catch { /* best-effort */ }
|
|
205
|
-
if (runLog) runLog.logEvent(event);
|
|
206
|
-
});
|
|
207
|
-
const progressNotifier = buildProgressNotifier(extra);
|
|
208
|
-
if (progressNotifier) emitter.on("progress", progressNotifier);
|
|
209
|
-
return emitter;
|
|
210
|
-
}
|
|
211
|
-
|
|
212
|
-
// ── Handler dispatch map (imports from sub-modules) ──────────────────
|
|
28
|
+
// ── Handler dispatch ─────────────────────────────────────────────────
|
|
213
29
|
|
|
30
|
+
import { asObject, failPayload } from "./shared-helpers.js";
|
|
214
31
|
import { handleRun, handleResume } from "./handlers/run-handler.js";
|
|
215
32
|
import {
|
|
216
33
|
handleCode, handleReview, handlePlan, handleDiscover,
|
|
@@ -223,36 +40,34 @@ import {
|
|
|
223
40
|
} from "./handlers/management-handlers.js";
|
|
224
41
|
import { handleHu, handleSkills, handleSuggest } from "./handlers/hu-handlers.js";
|
|
225
42
|
|
|
226
|
-
const toolHandlers = {
|
|
227
|
-
kj_status: (a, server) => handleStatus(a, server),
|
|
228
|
-
kj_init: (a) => handleInit(a),
|
|
229
|
-
kj_doctor: (a) => handleDoctor(a),
|
|
230
|
-
kj_agents: (a) => handleAgents(a),
|
|
231
|
-
kj_preflight: (a) => handlePreflight(a),
|
|
232
|
-
kj_config: (a) => handleConfig(a),
|
|
233
|
-
kj_scan: (a, server) => handleScan(a, server),
|
|
234
|
-
kj_roles: (a) => handleRoles(a),
|
|
235
|
-
kj_report: (a) => handleReport(a),
|
|
236
|
-
kj_resume: (a, server, extra) => handleResume(a, server, extra),
|
|
237
|
-
kj_run: (a, server, extra) => handleRun(a, server, extra),
|
|
238
|
-
kj_code: (a, server, extra) => handleCode(a, server, extra),
|
|
239
|
-
kj_review: (a, server, extra) => handleReview(a, server, extra),
|
|
240
|
-
kj_plan: (a, server, extra) => handlePlan(a, server, extra),
|
|
241
|
-
kj_discover: (a, server, extra) => handleDiscover(a, server, extra),
|
|
242
|
-
kj_triage: (a, server, extra) => handleTriage(a, server, extra),
|
|
243
|
-
kj_researcher: (a, server, extra) => handleResearcher(a, server, extra),
|
|
244
|
-
kj_architect: (a, server, extra) => handleArchitect(a, server, extra),
|
|
245
|
-
kj_audit: (a, server, extra) => handleAudit(a, server, extra),
|
|
246
|
-
kj_board: (a) => handleBoard(a),
|
|
247
|
-
kj_hu: (a, server) => handleHu(a, server),
|
|
248
|
-
kj_suggest: (a) => handleSuggest(a),
|
|
249
|
-
kj_skills: (a) => handleSkills(a),
|
|
250
|
-
kj_undo: (a, server) => handleUndo(a, server)
|
|
251
|
-
};
|
|
252
|
-
|
|
253
43
|
export async function handleToolCall(name, args, server, extra) {
|
|
254
44
|
const a = asObject(args);
|
|
255
|
-
const handler =
|
|
45
|
+
const handler = {
|
|
46
|
+
kj_status: (a, server) => handleStatus(a, server),
|
|
47
|
+
kj_init: (a) => handleInit(a),
|
|
48
|
+
kj_doctor: (a) => handleDoctor(a),
|
|
49
|
+
kj_agents: (a) => handleAgents(a),
|
|
50
|
+
kj_preflight: (a) => handlePreflight(a),
|
|
51
|
+
kj_config: (a) => handleConfig(a),
|
|
52
|
+
kj_scan: (a, server) => handleScan(a, server),
|
|
53
|
+
kj_roles: (a) => handleRoles(a),
|
|
54
|
+
kj_report: (a) => handleReport(a),
|
|
55
|
+
kj_resume: (a, server, extra) => handleResume(a, server, extra),
|
|
56
|
+
kj_run: (a, server, extra) => handleRun(a, server, extra),
|
|
57
|
+
kj_code: (a, server, extra) => handleCode(a, server, extra),
|
|
58
|
+
kj_review: (a, server, extra) => handleReview(a, server, extra),
|
|
59
|
+
kj_plan: (a, server, extra) => handlePlan(a, server, extra),
|
|
60
|
+
kj_discover: (a, server, extra) => handleDiscover(a, server, extra),
|
|
61
|
+
kj_triage: (a, server, extra) => handleTriage(a, server, extra),
|
|
62
|
+
kj_researcher: (a, server, extra) => handleResearcher(a, server, extra),
|
|
63
|
+
kj_architect: (a, server, extra) => handleArchitect(a, server, extra),
|
|
64
|
+
kj_audit: (a, server, extra) => handleAudit(a, server, extra),
|
|
65
|
+
kj_board: (a) => handleBoard(a),
|
|
66
|
+
kj_hu: (a, server) => handleHu(a, server),
|
|
67
|
+
kj_suggest: (a) => handleSuggest(a),
|
|
68
|
+
kj_skills: (a) => handleSkills(a),
|
|
69
|
+
kj_undo: (a, server) => handleUndo(a, server)
|
|
70
|
+
}[name];
|
|
256
71
|
if (handler) {
|
|
257
72
|
return handler(a, server, extra);
|
|
258
73
|
}
|
package/src/mcp/server.js
CHANGED
|
@@ -50,7 +50,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
|
|
|
50
50
|
});
|
|
51
51
|
|
|
52
52
|
// --- Orphan process protection + version watcher ---
|
|
53
|
-
import { setupOrphanGuard, setupVersionWatcher, setupMemoryWatchdog } from "./orphan-guard.js";
|
|
53
|
+
import { setupOrphanGuard, setupVersionWatcher, setupMemoryWatchdog, readAndDeleteRestartMarker } from "./orphan-guard.js";
|
|
54
|
+
|
|
55
|
+
// Check if this is a restart after update
|
|
56
|
+
const restartedVersion = readAndDeleteRestartMarker();
|
|
57
|
+
if (restartedVersion) {
|
|
58
|
+
process.stderr.write(`[karajan-mcp] MCP server restarted after update to v${restartedVersion}\n`);
|
|
59
|
+
}
|
|
60
|
+
|
|
54
61
|
setupOrphanGuard();
|
|
55
62
|
setupVersionWatcher({ pkgPath: PKG_PATH, currentVersion: LOADED_VERSION });
|
|
56
63
|
setupMemoryWatchdog();
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared helpers used by MCP handler sub-modules.
|
|
3
|
+
* Extracted from server-handlers.js to break circular import chains
|
|
4
|
+
* (server-handlers.js ↔ handlers/*.js).
|
|
5
|
+
*
|
|
6
|
+
* Sub-handlers MUST import from here, NOT from server-handlers.js.
|
|
7
|
+
* server-handlers.js re-exports everything for external consumers.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { EventEmitter } from "node:events";
|
|
11
|
+
import fs from "node:fs/promises";
|
|
12
|
+
import { loadConfig, applyRunOverrides, validateConfig } from "../config.js";
|
|
13
|
+
import { currentBranch } from "../utils/git.js";
|
|
14
|
+
import { buildProgressNotifier } from "./progress.js";
|
|
15
|
+
import { compressResponse, compactStringify } from "./response-compressor.js";
|
|
16
|
+
import { classifyError } from "./error-classifiers.js";
|
|
17
|
+
|
|
18
|
+
export { classifyError } from "./error-classifiers.js";
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Resolve the user's project directory.
|
|
22
|
+
* Priority: 1) explicit projectDir param, 2) MCP roots, 3) error with instructions.
|
|
23
|
+
*/
|
|
24
|
+
export async function resolveProjectDir(server, explicitProjectDir) {
|
|
25
|
+
if (explicitProjectDir) return explicitProjectDir;
|
|
26
|
+
|
|
27
|
+
try {
|
|
28
|
+
const { roots } = await server.listRoots();
|
|
29
|
+
if (roots?.length > 0) {
|
|
30
|
+
const uri = roots[0].uri;
|
|
31
|
+
if (uri.startsWith("file://")) return new URL(uri).pathname;
|
|
32
|
+
return uri;
|
|
33
|
+
}
|
|
34
|
+
} catch { /* client may not support roots */ }
|
|
35
|
+
|
|
36
|
+
const cwd = process.cwd();
|
|
37
|
+
try {
|
|
38
|
+
const hasGit = await fs.access(`${cwd}/.git`).then(() => true).catch(() => false);
|
|
39
|
+
const hasPkg = await fs.access(`${cwd}/package.json`).then(() => true).catch(() => false);
|
|
40
|
+
if (hasGit || hasPkg) return cwd;
|
|
41
|
+
} catch { /* ignore */ }
|
|
42
|
+
|
|
43
|
+
throw new Error(
|
|
44
|
+
`Cannot determine project directory. The MCP server is running from "${cwd}" which does not appear to be your project. ` +
|
|
45
|
+
`Fix: pass the "projectDir" parameter with the absolute path to your project (e.g., projectDir: "/home/user/my-project"), ` +
|
|
46
|
+
`or run "kj init" inside your project directory.`
|
|
47
|
+
);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
export function asObject(value) {
|
|
51
|
+
if (value && typeof value === "object") return value;
|
|
52
|
+
return {};
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export function responseText(payload) {
|
|
56
|
+
const compressed = compressResponse(payload);
|
|
57
|
+
return {
|
|
58
|
+
content: [{ type: "text", text: compactStringify(compressed) }]
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
export function failPayload(message, details = {}) {
|
|
63
|
+
return {
|
|
64
|
+
ok: false,
|
|
65
|
+
error: message,
|
|
66
|
+
...details
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
export async function assertNotOnBaseBranch(config) {
|
|
71
|
+
const baseBranch = config?.base_branch || "main";
|
|
72
|
+
let branch;
|
|
73
|
+
try {
|
|
74
|
+
branch = await currentBranch();
|
|
75
|
+
} catch {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
if (branch === baseBranch) {
|
|
79
|
+
throw new Error(
|
|
80
|
+
`You are on the base branch '${baseBranch}'. Karajan needs a feature branch to compute the diff for review. ` +
|
|
81
|
+
`Create a new branch first (e.g. 'git checkout -b feat/<task-description>') and then run this command again. ` +
|
|
82
|
+
`Do NOT run kj_code directly — create the branch first so the full pipeline (code + review) works correctly.`
|
|
83
|
+
);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export function enrichedFailPayload(error, toolName) {
|
|
88
|
+
const msg = error?.message || String(error);
|
|
89
|
+
const { category, suggestion } = classifyError(error);
|
|
90
|
+
const payload = {
|
|
91
|
+
ok: false,
|
|
92
|
+
error: msg,
|
|
93
|
+
tool: toolName,
|
|
94
|
+
category
|
|
95
|
+
};
|
|
96
|
+
if (suggestion) payload.suggestion = suggestion;
|
|
97
|
+
return payload;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
export async function buildConfig(options, commandName = "run") {
|
|
101
|
+
const { config } = await loadConfig();
|
|
102
|
+
const merged = applyRunOverrides(config, options || {});
|
|
103
|
+
validateConfig(merged, commandName);
|
|
104
|
+
return merged;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
export function buildAskQuestion(server) {
|
|
108
|
+
return async (question) => {
|
|
109
|
+
try {
|
|
110
|
+
const result = await server.elicitInput({
|
|
111
|
+
message: question,
|
|
112
|
+
requestedSchema: {
|
|
113
|
+
type: "object",
|
|
114
|
+
properties: {
|
|
115
|
+
answer: { type: "string", description: "Your response" }
|
|
116
|
+
},
|
|
117
|
+
required: ["answer"]
|
|
118
|
+
}
|
|
119
|
+
});
|
|
120
|
+
return result.action === "accept" ? result.content?.answer || null : null;
|
|
121
|
+
} catch {
|
|
122
|
+
return null;
|
|
123
|
+
}
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
const EVENT_LOG_LEVELS = {
|
|
128
|
+
"agent:stall": "warning",
|
|
129
|
+
"agent:heartbeat": "info"
|
|
130
|
+
};
|
|
131
|
+
|
|
132
|
+
export function buildDirectEmitter(server, runLog, extra) {
|
|
133
|
+
const emitter = new EventEmitter();
|
|
134
|
+
emitter.on("progress", (event) => {
|
|
135
|
+
try {
|
|
136
|
+
const level = EVENT_LOG_LEVELS[event.type] || "debug";
|
|
137
|
+
server.sendLoggingMessage({ level, logger: "karajan", data: event });
|
|
138
|
+
} catch { /* best-effort */ }
|
|
139
|
+
if (runLog) runLog.logEvent(event);
|
|
140
|
+
});
|
|
141
|
+
const progressNotifier = buildProgressNotifier(extra);
|
|
142
|
+
if (progressNotifier) emitter.on("progress", progressNotifier);
|
|
143
|
+
return emitter;
|
|
144
|
+
}
|
|
@@ -38,19 +38,30 @@ async function checkDocker() {
|
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
+
const SONAR_STARTUP_POLL_MS = 5000;
|
|
42
|
+
const SONAR_STARTUP_MAX_WAIT_MS = 60000;
|
|
43
|
+
|
|
44
|
+
async function waitForSonar(host, maxWaitMs = SONAR_STARTUP_MAX_WAIT_MS) {
|
|
45
|
+
const deadline = Date.now() + maxWaitMs;
|
|
46
|
+
while (Date.now() < deadline) {
|
|
47
|
+
if (await isSonarReachable(host)) return true;
|
|
48
|
+
await new Promise(r => setTimeout(r, SONAR_STARTUP_POLL_MS));
|
|
49
|
+
}
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
|
|
41
53
|
async function checkSonarReachable(host) {
|
|
42
54
|
const reachable = await isSonarReachable(host);
|
|
43
55
|
if (reachable) {
|
|
44
56
|
return { name: "sonar-reachable", ok: true, detail: `SonarQube reachable at ${host}`, remediated: false };
|
|
45
57
|
}
|
|
46
58
|
|
|
47
|
-
// Auto-remediation:
|
|
59
|
+
// Auto-remediation: start SonarQube and wait for it to be ready
|
|
48
60
|
try {
|
|
49
61
|
const upResult = await sonarUp(host);
|
|
50
62
|
if (upResult.exitCode === 0) {
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
if (reachableAfter) {
|
|
63
|
+
// SonarQube needs 20-40s to start. Poll until ready.
|
|
64
|
+
if (await waitForSonar(host)) {
|
|
54
65
|
return { name: "sonar-reachable", ok: true, detail: `SonarQube started and reachable at ${host}`, remediated: true };
|
|
55
66
|
}
|
|
56
67
|
}
|
|
@@ -58,7 +69,7 @@ async function checkSonarReachable(host) {
|
|
|
58
69
|
// sonarUp failed, fall through
|
|
59
70
|
}
|
|
60
71
|
|
|
61
|
-
return { name: "sonar-reachable", ok: false, detail: `SonarQube not reachable at ${host} (auto-start failed)` };
|
|
72
|
+
return { name: "sonar-reachable", ok: false, detail: `SonarQube not reachable at ${host} (auto-start failed after ${SONAR_STARTUP_MAX_WAIT_MS / 1000}s)` };
|
|
62
73
|
}
|
|
63
74
|
|
|
64
75
|
async function checkSonarAuth(config) {
|
package/src/orchestrator.js
CHANGED
|
@@ -1613,6 +1613,20 @@ export async function runFlow({ task, config, logger, flags = {}, emitter = null
|
|
|
1613
1613
|
logger.warn(`Skill cleanup failed (non-blocking): ${err.message}`);
|
|
1614
1614
|
}
|
|
1615
1615
|
}
|
|
1616
|
+
|
|
1617
|
+
// --- Telemetry: anonymous pipeline_complete event (non-blocking) ---
|
|
1618
|
+
try {
|
|
1619
|
+
const { sendTelemetryEvent } = await import("./utils/telemetry.js");
|
|
1620
|
+
const durationS = Math.round((Date.now() - ctx.startedAt) / 1000);
|
|
1621
|
+
const sessionStatus = ctx.session?.status || "unknown";
|
|
1622
|
+
sendTelemetryEvent("pipeline_complete", {
|
|
1623
|
+
mode: config.review_mode,
|
|
1624
|
+
agent: ctx.coderRole?.provider || config.coder,
|
|
1625
|
+
duration_s: durationS,
|
|
1626
|
+
success: sessionStatus === "approved",
|
|
1627
|
+
taskType: ctx.session?.resolved_policies?.taskType || null
|
|
1628
|
+
}, config).catch(() => {});
|
|
1629
|
+
} catch { /* non-blocking */ }
|
|
1616
1630
|
}
|
|
1617
1631
|
}
|
|
1618
1632
|
|
package/src/utils/process.js
CHANGED
|
@@ -76,6 +76,10 @@ async function awaitWithTimeout(subprocess, timeout, getStdout) {
|
|
|
76
76
|
|
|
77
77
|
export async function runCommand(command, args = [], options = {}) {
|
|
78
78
|
const { timeout, onOutput, silenceTimeoutMs, partialOutputFlushMs, ...rest } = options;
|
|
79
|
+
// Always detach stdin: KJ subprocesses never need interactive input.
|
|
80
|
+
// Without this, a subprocess prompting for input (sonar credentials,
|
|
81
|
+
// agent approval, npm prompts) hangs forever since there is no TTY.
|
|
82
|
+
if (!rest.stdin) rest.stdin = "ignore";
|
|
79
83
|
const subprocess = execa(command, args, { reject: false, ...rest });
|
|
80
84
|
|
|
81
85
|
let stdoutAccum = "";
|