ctxtop 0.0.0-stage → 4.0.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/.antigravity-plugin/plugin.json +36 -0
- package/.claude-plugin/plugin.json +18 -0
- package/CHECKSUMS.sha256 +149 -0
- package/LICENSE +27 -0
- package/README.md +330 -3
- package/SECURITY.md +22 -0
- package/agents/ah-flash-scout.md +25 -0
- package/assets/advanced_view_loaded_420px.png +0 -0
- package/assets/hero-demo.svg +188 -0
- package/assets/logo.svg +19 -0
- package/assets/simple_view_lean_420px.png +0 -0
- package/assets/simple_view_loaded_420px.png +0 -0
- package/assets/social-preview.svg +72 -0
- package/assets/zone_c_step3_shield_full.png +0 -0
- package/bin/ah-statusline.mjs +145 -0
- package/bin/cli.mjs +3 -0
- package/bin/ctxtop.mjs +1474 -0
- package/commands/cost-radar.md +11 -0
- package/commands/evolve.md +10 -0
- package/commands/handoff.md +10 -0
- package/commands/horizon.md +10 -0
- package/commands/inspect.md +10 -0
- package/commands/precheck.md +10 -0
- package/config/default_flightcheck.json +114 -0
- package/config/modelCatalog.json +620 -0
- package/config/platformQuirks.json +19 -0
- package/hooks/handlers/compact-lifecycle.mjs +262 -0
- package/hooks/handlers/hookIo.mjs +255 -0
- package/hooks/handlers/hookIpcClient.mjs +83 -0
- package/hooks/handlers/post-tool-use.mjs +265 -0
- package/hooks/handlers/pre-model-switch.mjs +249 -0
- package/hooks/handlers/pre-tool-use.mjs +365 -0
- package/hooks/handlers/stop-gate.mjs +240 -0
- package/hooks/handlers/user-prompt-submit.mjs +143 -0
- package/hooks/hooks.json +81 -0
- package/hooks/post_invocation.mjs +13 -0
- package/hooks/post_tool_use.mjs +17 -0
- package/hooks/pre_invocation.mjs +14 -0
- package/hooks/pre_tool_use.mjs +97 -0
- package/hooks/register.js +687 -0
- package/hooks/session_start.mjs +14 -0
- package/hooks/stop.mjs +13 -0
- package/hooks.json +56 -0
- package/package.json +103 -4
- package/packages/antigravity/package.json +14 -0
- package/packages/antigravity/src/index.mjs +1 -0
- package/packages/claude-code/package.json +14 -0
- package/packages/claude-code/src/index.mjs +2 -0
- package/packages/core/package.json +14 -0
- package/packages/core/src/index.mjs +1 -0
- package/packages/engine-node/package.json +14 -0
- package/packages/engine-node/src/index.mjs +1 -0
- package/packages/mcp/package.json +17 -0
- package/packages/mcp/src/server.mjs +396 -0
- package/packages/pro/LICENSE-COMMERCIAL.md +19 -0
- package/packages/pro/README-SIGNING.md +30 -0
- package/packages/pro/package.json +16 -0
- package/packages/pro/src/index.mjs +3 -0
- package/packages/pro/src/team_finops_pack.mjs +241 -0
- package/packages/pro/workers/polar_webhook_worker.mjs +215 -0
- package/plugin.json +36 -0
- package/rules/AGENTS.md +10 -0
- package/sidecars/horizon-daemon/ipcServer.mjs +24 -0
- package/sidecars/horizon-daemon/server.mjs +2002 -0
- package/sidecars/horizon-daemon/sidecar.json +19 -0
- package/skills/cost-radar/SKILL.md +21 -0
- package/skills/evolve/SKILL.md +21 -0
- package/skills/handoff/SKILL.md +42 -0
- package/skills/horizon/SKILL.md +17 -0
- package/skills/inspect/SKILL.md +18 -0
- package/skills/precheck/SKILL.md +44 -0
- package/src/adapters/antigravity/index.mjs +79 -0
- package/src/adapters/claude-code/index.mjs +155 -0
- package/src/cli/cost_radar.mjs +70 -0
- package/src/cli/doctor.mjs +351 -0
- package/src/cli/horizon_hud.mjs +686 -0
- package/src/cli/init.mjs +425 -0
- package/src/cli/postmortem.mjs +515 -0
- package/src/coach/cacheGravityRouter.mjs +12 -0
- package/src/config/modelCatalog.json +620 -0
- package/src/config/platformQuirks.json +19 -0
- package/src/core/action_queue.mjs +264 -0
- package/src/core/ag_bridge.mjs +346 -0
- package/src/core/atomic_io.mjs +124 -0
- package/src/core/baseline.mjs +607 -0
- package/src/core/blindspot_sensors.mjs +399 -0
- package/src/core/classifier.mjs +1757 -0
- package/src/core/coach/circuit_breakers.mjs +650 -0
- package/src/core/coach/contradiction_auditor.mjs +239 -0
- package/src/core/coach/effort_advisor.mjs +143 -0
- package/src/core/coach/handoff_hydrator.mjs +483 -0
- package/src/core/coach/progressive_checkpointer.mjs +551 -0
- package/src/core/coach/prompt_decomposer_coach.mjs +141 -0
- package/src/core/coach/reflector_queue.mjs +505 -0
- package/src/core/coach/saved_quota_ledger.mjs +615 -0
- package/src/core/coach/subagent_ipi_sanitizer.mjs +200 -0
- package/src/core/coach/subagent_phantom_auditor.mjs +261 -0
- package/src/core/coach/task_quota_router.mjs +955 -0
- package/src/core/coach/turn_zero_gate.mjs +574 -0
- package/src/core/compaction_coach.mjs +1126 -0
- package/src/core/config.mjs +214 -0
- package/src/core/constants.mjs +1800 -0
- package/src/core/detectors_det01_to_16.mjs +1474 -0
- package/src/core/episodic_memory.mjs +135 -0
- package/src/core/fts5_output_compressor.mjs +359 -0
- package/src/core/git_ledger.mjs +189 -0
- package/src/core/handoff_audit.mjs +558 -0
- package/src/core/history.mjs +221 -0
- package/src/core/hook_diagnostics.mjs +158 -0
- package/src/core/horizon_classifier.mjs +326 -0
- package/src/core/horizon_config.mjs +802 -0
- package/src/core/host_watchdog.mjs +200 -0
- package/src/core/layer5_hygiene.mjs +966 -0
- package/src/core/log_resolver.mjs +231 -0
- package/src/core/mcp_auditor.mjs +138 -0
- package/src/core/micro_skills_store.mjs +91 -0
- package/src/core/offenders.mjs +161 -0
- package/src/core/parser.mjs +1996 -0
- package/src/core/path_canonicalizer.mjs +73 -0
- package/src/core/paths.mjs +310 -0
- package/src/core/prefix_cache_shield.mjs +386 -0
- package/src/core/pro_license.mjs +385 -0
- package/src/core/prompt_rubric.mjs +518 -0
- package/src/core/pruner.mjs +433 -0
- package/src/core/quota.mjs +1860 -0
- package/src/core/rsi_instinct_engine.mjs +1197 -0
- package/src/core/sanitizer.mjs +121 -0
- package/src/core/session_forensics.mjs +303 -0
- package/src/core/session_timeline.mjs +358 -0
- package/src/core/settings.mjs +99 -0
- package/src/core/shared/detectors.mjs +1342 -0
- package/src/core/shared/fnv1a64.mjs +85 -0
- package/src/core/shared/handoff_schema.mjs +123 -0
- package/src/core/shared/index.mjs +5 -0
- package/src/core/shared/ipi_sanitizer.mjs +165 -0
- package/src/core/shared/micro_skills.mjs +1 -0
- package/src/core/shared/plugin_validator.mjs +202 -0
- package/src/core/shared/prompt_hygiene_governor.mjs +1 -0
- package/src/core/sidecar_store.mjs +302 -0
- package/src/core/sprint_metrics.mjs +366 -0
- package/src/core/sqlite_client.mjs +283 -0
- package/src/core/storage_doctor.mjs +358 -0
- package/src/core/subagents.mjs +609 -0
- package/src/core/swarm_topology.mjs +360 -0
- package/src/core/task_quota_router.mjs +1656 -0
- package/src/core/telemetry/cache_ttl_watchdog.mjs +284 -0
- package/src/core/telemetry/scope_lock_registry.mjs +578 -0
- package/src/core/telemetry/shadow_file_detector.mjs +291 -0
- package/src/core/telemetry/trajectory_watcher.mjs +259 -0
- package/src/core/timeline_svg.mjs +236 -0
- package/src/core/tool_surgeon.mjs +305 -0
- package/src/core/trajectory_stitcher.mjs +645 -0
- package/src/core/u_shaped_optimizer.mjs +789 -0
- package/src/core/wal_hygiene.mjs +233 -0
- package/src/core-isomorphic/catalog/detectorCatalog.mjs +558 -0
- package/src/core-isomorphic/catalog/index.mjs +1 -0
- package/src/core-isomorphic/coach/cacheGravityRouter.mjs +720 -0
- package/src/core-isomorphic/coach/microSkills.mjs +1 -0
- package/src/core-isomorphic/coach/promptHygieneGovernor.mjs +1 -0
- package/src/core-isomorphic/coach/repoCalibration.mjs +254 -0
- package/src/core-isomorphic/coach/savedQuotaLedger.mjs +527 -0
- package/src/core-isomorphic/coach/stateBatonHydrator.mjs +810 -0
- package/src/core-isomorphic/coach/ttlWatchdog.mjs +457 -0
- package/src/core-isomorphic/config/anthropicModelCatalog.json +203 -0
- package/src/core-isomorphic/config/catalogLoader.mjs +768 -0
- package/src/core-isomorphic/config/horizonConfig.mjs +1009 -0
- package/src/core-isomorphic/control/callTree.mjs +338 -0
- package/src/core-isomorphic/control/coachLatches.mjs +126 -0
- package/src/core-isomorphic/control/controlStateMachine.mjs +205 -0
- package/src/core-isomorphic/control/index.mjs +49 -0
- package/src/core-isomorphic/control/swarmWorktree.mjs +109 -0
- package/src/core-isomorphic/control/toolSuspension.mjs +197 -0
- package/src/core-isomorphic/diagnostics/drift_guard.mjs +382 -0
- package/src/core-isomorphic/diagnostics/index.mjs +9 -0
- package/src/core-isomorphic/diagnostics/micro_skills.mjs +471 -0
- package/src/core-isomorphic/diagnostics/prompt_hygiene_governor.mjs +622 -0
- package/src/core-isomorphic/economics/billingBlocks.mjs +251 -0
- package/src/core-isomorphic/economics/cacheGravity.mjs +351 -0
- package/src/core-isomorphic/economics/cliffBreaker.mjs +170 -0
- package/src/core-isomorphic/economics/driftLatency.mjs +319 -0
- package/src/core-isomorphic/economics/dualTtl.mjs +198 -0
- package/src/core-isomorphic/economics/index.mjs +47 -0
- package/src/core-isomorphic/economics/retentionRadar.mjs +348 -0
- package/src/core-isomorphic/guards/circuitBreakers.mjs +1202 -0
- package/src/core-isomorphic/guards/det01_03_shell_secret.mjs +1035 -0
- package/src/core-isomorphic/guards/det04_12_thrash_rot.mjs +480 -0
- package/src/core-isomorphic/guards/det13_20_mcp_scope.mjs +603 -0
- package/src/core-isomorphic/guards/losslessPostSanitizer.mjs +301 -0
- package/src/core-isomorphic/index.js +26 -0
- package/src/core-isomorphic/telemetry/otelExporter.mjs +187 -0
- package/src/core-isomorphic/telemetry/scopeLockRegistry.mjs +522 -0
- package/src/core-isomorphic/telemetry/sprintMetrics.mjs +327 -0
- package/src/core-isomorphic/telemetry/swarmTopology.mjs +152 -0
- package/src/core-isomorphic/telemetry/telemetryBridge.mjs +1132 -0
- package/src/core-isomorphic/ui/brailleSparkline.mjs +142 -0
- package/src/core-isomorphic/ui/costRadarSvg.mjs +276 -0
- package/src/core-isomorphic/ui/horizonGrid.mjs +475 -0
- package/src/core-isomorphic/ui/horizonPanelHtml.mjs +1181 -0
- package/src/core-isomorphic/ui/modViews.mjs +1478 -0
- package/src/core-isomorphic/ui/pdfReceiptGenerator.mjs +329 -0
- package/src/core-isomorphic/ustf/index.mjs +7 -0
- package/src/core-isomorphic/ustf/normalizer.mjs +512 -0
- package/src/core-isomorphic/ustf/schema.mjs +186 -0
- package/src/core-isomorphic/utils/runtime.mjs +962 -0
- package/src/demo/synthetic_states.mjs +661 -0
- package/src/diagnostics/bugReportGenerator.mjs +253 -0
- package/src/diagnostics/doctorEngine.mjs +203 -0
- package/src/engine-node/db/index.mjs +58 -0
- package/src/engine-node/db/jsonl_fallback.mjs +184 -0
- package/src/engine-node/db/probe.mjs +110 -0
- package/src/engine-node/db/sqlite_wrapper.mjs +122 -0
- package/src/engine-node/index.mjs +9 -0
- package/src/engine-node/ipc/client.mjs +447 -0
- package/src/engine-node/ipc/index.mjs +22 -0
- package/src/engine-node/ipc/protocol.mjs +177 -0
- package/src/engine-node/ipc/server.mjs +445 -0
- package/src/engine-node/offloader/index.mjs +6 -0
- package/src/engine-node/offloader/tool_offloader.mjs +241 -0
- package/src/engine-node/sensors/blindspots.mjs +369 -0
- package/src/engine-node/sensors/git_merge_tree.mjs +223 -0
- package/src/engine-node/sensors/index.mjs +7 -0
- package/src/hooks/portfolio_runtime.mjs +858 -0
- package/src/hooks/post_invocation.mjs +419 -0
- package/src/hooks/pre_invocation.mjs +1015 -0
- package/src/hooks/session_start.mjs +161 -0
- package/src/shims/agy_cli_compressor.mjs +705 -0
- package/src/shims/agy_git_guard.mjs +749 -0
- package/src/shims/ah_log_query.mjs +39 -0
- package/src/ui/costRadarSvg.mjs +6 -0
- package/src/ui/horizonGrid.mjs +1 -0
- package/src/ui/horizonPanelHtml.mjs +1 -0
- package/src/ui/horizon_panel.css +167 -0
- package/src/ui/horizon_panel.js +212 -0
- package/src/ui/modViews.mjs +1 -0
- package/src/utils/nodeIo.mjs +59 -0
- package/src/utils/runtime.mjs +1 -0
- package/src/webview/advanced_view.html +1808 -0
- package/src/webview/horizon_panel.html +11389 -0
- package/src/webview/registry.mjs +80 -0
- package/src/webview/simple_view.html +1370 -0
|
@@ -0,0 +1,223 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file src/engine-node/sensors/git_merge_tree.mjs
|
|
3
|
+
* Non-destructive DET-31 Cross-Worktree Git Merge Conflict Sensor.
|
|
4
|
+
*
|
|
5
|
+
* Runs `git merge-tree --write-tree` with 0 working-tree or index mutations,
|
|
6
|
+
* and caches clean/conflict results per (workspaceDir, baseCommit, targetCommit, .git/index mtime, .git/HEAD mtime)
|
|
7
|
+
* so polling loops on win32 run in <0.05ms without repeated 35ms subprocess spawns.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { execFileSync } from 'node:child_process';
|
|
11
|
+
import fs from 'node:fs';
|
|
12
|
+
import path from 'node:path';
|
|
13
|
+
|
|
14
|
+
const MERGE_TREE_CACHE = new Map();
|
|
15
|
+
const MAX_CACHE_ENTRIES = 128;
|
|
16
|
+
|
|
17
|
+
function resolveGitStateStamp(cwd) {
|
|
18
|
+
try {
|
|
19
|
+
const gitDir = path.join(cwd, '.git');
|
|
20
|
+
const stGit = fs.statSync(gitDir);
|
|
21
|
+
if (!stGit.isDirectory() && !stGit.isFile()) return null;
|
|
22
|
+
let indexMtime = 0;
|
|
23
|
+
let headMtime = 0;
|
|
24
|
+
let refsMtime = 0;
|
|
25
|
+
try { indexMtime = fs.statSync(path.join(gitDir, 'index')).mtimeMs; } catch {}
|
|
26
|
+
try { headMtime = fs.statSync(path.join(gitDir, 'HEAD')).mtimeMs; } catch {}
|
|
27
|
+
try { refsMtime = fs.statSync(path.join(gitDir, 'refs', 'heads')).mtimeMs; } catch {}
|
|
28
|
+
return `${indexMtime}:${headMtime}:${refsMtime}`;
|
|
29
|
+
} catch {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export function clearGitMergeTreeCache() {
|
|
35
|
+
MERGE_TREE_CACHE.clear();
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Parses conflict files and messages from git merge-tree output.
|
|
40
|
+
*
|
|
41
|
+
* @param {string} output
|
|
42
|
+
* @returns {{ conflictFiles: string[], conflictMessages: string[] }}
|
|
43
|
+
*/
|
|
44
|
+
export function parseMergeTreeOutput(output = '') {
|
|
45
|
+
const lines = output.split(/\r?\n/);
|
|
46
|
+
const conflictFiles = new Set();
|
|
47
|
+
const conflictMessages = [];
|
|
48
|
+
|
|
49
|
+
for (const line of lines) {
|
|
50
|
+
const trimmed = line.trim();
|
|
51
|
+
if (!trimmed) continue;
|
|
52
|
+
|
|
53
|
+
// Line format: CONFLICT (content): Merge conflict in path/to/file.js
|
|
54
|
+
const conflictMatch = trimmed.match(/^CONFLICT\s*\(([^)]+)\):\s*(.+)$/i);
|
|
55
|
+
if (conflictMatch) {
|
|
56
|
+
conflictMessages.push(trimmed);
|
|
57
|
+
const detail = conflictMatch[2];
|
|
58
|
+
const fileMatch = detail.match(/(?:in|of)\s+([^\s]+)$/i);
|
|
59
|
+
if (fileMatch) {
|
|
60
|
+
conflictFiles.add(fileMatch[1].trim());
|
|
61
|
+
}
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
// Git merge-tree unmerged stage entry: 100644 <hash> <stage> <file>
|
|
66
|
+
const stageMatch = trimmed.match(/^\d{6}\s+[0-9a-f]{40,64}\s+[123]\s+(.+)$/i);
|
|
67
|
+
if (stageMatch) {
|
|
68
|
+
conflictFiles.add(stageMatch[1].trim());
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
return {
|
|
73
|
+
conflictFiles: Array.from(conflictFiles),
|
|
74
|
+
conflictMessages
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* Probes for merge conflicts between two commits or branch heads non-destructively.
|
|
80
|
+
*
|
|
81
|
+
* @param {string} baseCommit - Commit or ref (e.g. 'HEAD', 'main')
|
|
82
|
+
* @param {string} targetCommit - Commit or ref (e.g. 'feature-branch', worktree commit)
|
|
83
|
+
* @param {object} [options={}]
|
|
84
|
+
* @param {string} [options.workspaceDir] - Repository working directory
|
|
85
|
+
* @param {boolean} [options.nameOnly=false] - Only report conflicting file names
|
|
86
|
+
* @param {number} [options.timeoutMs=5000] - Process execution timeout
|
|
87
|
+
* @param {boolean} [options.bypassCache=false] - Force fresh git subprocess execution
|
|
88
|
+
* @returns {{
|
|
89
|
+
* clean: boolean,
|
|
90
|
+
* hasConflict: boolean,
|
|
91
|
+
* treeHash: string | null,
|
|
92
|
+
* conflictFiles: string[],
|
|
93
|
+
* conflictMessages: string[],
|
|
94
|
+
* latencyMs: number,
|
|
95
|
+
* cached?: boolean,
|
|
96
|
+
* error?: string,
|
|
97
|
+
* degraded?: boolean
|
|
98
|
+
* }}
|
|
99
|
+
*/
|
|
100
|
+
export function probeGitMergeTree(baseCommit, targetCommit, options = {}) {
|
|
101
|
+
const start = performance.now();
|
|
102
|
+
if (!baseCommit || !targetCommit) {
|
|
103
|
+
return {
|
|
104
|
+
clean: false,
|
|
105
|
+
hasConflict: false,
|
|
106
|
+
treeHash: null,
|
|
107
|
+
conflictFiles: [],
|
|
108
|
+
conflictMessages: [],
|
|
109
|
+
latencyMs: 0,
|
|
110
|
+
error: 'Both baseCommit and targetCommit must be provided'
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
const cwd = options.workspaceDir || process.cwd();
|
|
115
|
+
const gitStamp = !options.bypassCache ? resolveGitStateStamp(cwd) : null;
|
|
116
|
+
const cacheKey = gitStamp
|
|
117
|
+
? `${cwd}|${baseCommit}|${targetCommit}|${Boolean(options.nameOnly)}|${gitStamp}`
|
|
118
|
+
: null;
|
|
119
|
+
|
|
120
|
+
if (cacheKey && MERGE_TREE_CACHE.has(cacheKey)) {
|
|
121
|
+
const cachedEntry = MERGE_TREE_CACHE.get(cacheKey);
|
|
122
|
+
const latencyMs = Number((performance.now() - start).toFixed(4));
|
|
123
|
+
return {
|
|
124
|
+
...cachedEntry,
|
|
125
|
+
conflictFiles: [...cachedEntry.conflictFiles],
|
|
126
|
+
conflictMessages: [...cachedEntry.conflictMessages],
|
|
127
|
+
latencyMs,
|
|
128
|
+
cached: true
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
const args = ['merge-tree', '--write-tree'];
|
|
133
|
+
if (options.nameOnly) {
|
|
134
|
+
args.push('--name-only');
|
|
135
|
+
}
|
|
136
|
+
args.push('--', String(baseCommit), String(targetCommit));
|
|
137
|
+
|
|
138
|
+
try {
|
|
139
|
+
const stdout = execFileSync('git', args, {
|
|
140
|
+
cwd,
|
|
141
|
+
encoding: 'utf8',
|
|
142
|
+
timeout: options.timeoutMs || 5000,
|
|
143
|
+
stdio: ['ignore', 'pipe', 'pipe']
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
const latencyMs = Number((performance.now() - start).toFixed(3));
|
|
147
|
+
const lines = stdout.trim().split(/\r?\n/);
|
|
148
|
+
const treeHash = lines[0] ? lines[0].trim() : null;
|
|
149
|
+
|
|
150
|
+
const result = {
|
|
151
|
+
clean: true,
|
|
152
|
+
hasConflict: false,
|
|
153
|
+
treeHash,
|
|
154
|
+
conflictFiles: [],
|
|
155
|
+
conflictMessages: [],
|
|
156
|
+
latencyMs
|
|
157
|
+
};
|
|
158
|
+
if (cacheKey) {
|
|
159
|
+
if (MERGE_TREE_CACHE.size >= MAX_CACHE_ENTRIES) {
|
|
160
|
+
const oldestKey = MERGE_TREE_CACHE.keys().next().value;
|
|
161
|
+
MERGE_TREE_CACHE.delete(oldestKey);
|
|
162
|
+
}
|
|
163
|
+
MERGE_TREE_CACHE.set(cacheKey, result);
|
|
164
|
+
}
|
|
165
|
+
return result;
|
|
166
|
+
} catch (err) {
|
|
167
|
+
const latencyMs = Number((performance.now() - start).toFixed(3));
|
|
168
|
+
|
|
169
|
+
// Exit status 1 signals a merge conflict in git merge-tree --write-tree
|
|
170
|
+
if (err && err.status === 1) {
|
|
171
|
+
const stderr = err.stderr ? String(err.stderr) : '';
|
|
172
|
+
if (/not something we can merge|fatal:|unknown option/i.test(stderr)) {
|
|
173
|
+
return {
|
|
174
|
+
clean: false,
|
|
175
|
+
hasConflict: false,
|
|
176
|
+
treeHash: null,
|
|
177
|
+
conflictFiles: [],
|
|
178
|
+
conflictMessages: [],
|
|
179
|
+
latencyMs,
|
|
180
|
+
error: stderr.trim() || 'Invalid commit or git error',
|
|
181
|
+
degraded: true
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
const out = (err.stdout ? String(err.stdout) : '') + '\n' + stderr;
|
|
186
|
+
const parsed = parseMergeTreeOutput(out);
|
|
187
|
+
const lines = (err.stdout ? String(err.stdout) : '').trim().split(/\r?\n/);
|
|
188
|
+
const treeHash = lines[0] && /^[0-9a-f]{40,64}$/i.test(lines[0].trim()) ? lines[0].trim() : null;
|
|
189
|
+
const hasRealConflict = parsed.conflictFiles.length > 0 || parsed.conflictMessages.length > 0;
|
|
190
|
+
|
|
191
|
+
const conflictResult = {
|
|
192
|
+
clean: false,
|
|
193
|
+
hasConflict: hasRealConflict,
|
|
194
|
+
treeHash,
|
|
195
|
+
conflictFiles: parsed.conflictFiles,
|
|
196
|
+
conflictMessages: parsed.conflictMessages,
|
|
197
|
+
latencyMs,
|
|
198
|
+
...(hasRealConflict ? {} : { error: stderr.trim() || 'Merge probe failed', degraded: true })
|
|
199
|
+
};
|
|
200
|
+
if (cacheKey && hasRealConflict) {
|
|
201
|
+
MERGE_TREE_CACHE.set(cacheKey, conflictResult);
|
|
202
|
+
}
|
|
203
|
+
return conflictResult;
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
// Any other error (e.g. invalid git ref, git not found, git version < 2.38) degrades gracefully
|
|
207
|
+
return {
|
|
208
|
+
clean: false,
|
|
209
|
+
hasConflict: false,
|
|
210
|
+
treeHash: null,
|
|
211
|
+
conflictFiles: [],
|
|
212
|
+
conflictMessages: [],
|
|
213
|
+
latencyMs,
|
|
214
|
+
error: err ? err.message || String(err) : 'Unknown git merge-tree error',
|
|
215
|
+
degraded: true
|
|
216
|
+
};
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
export default {
|
|
221
|
+
probeGitMergeTree,
|
|
222
|
+
clearGitMergeTreeCache
|
|
223
|
+
};
|