Skip to content

Commit 824a669

Browse files
Coding-Dev-ToolsCoding-Dev-Tools
committed
merge main into feat/prime-agent-integration
Reconcile the prime-agent branch with main's reviewed Galaxy spacetime implementation: the engine asset takes main's calibrations (orbital-speed gain 0.5, radius maximum 1.24, velocity decay 0.00005, no explicit-global loose-end floor) and the graph test suite matches main, while the branch keeps its prime-agent lifecycle/tooling work. The every-worker merges both sides: #174's bumped gains (link rest 2.4, repel/24, gravity 0.0033) with #177's full-range multipliers and the zero-floor cohesion coefficient. Cache-bust versions unified to 20260902-slider-merge-1.
1 parent 1a55eb9 commit 824a669

8 files changed

Lines changed: 11185 additions & 11609 deletions

File tree

‎engraphis/classic_assets/dashboard.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engraphis/classic_assets/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="icon" type="image/x-icon" href="/classic-assets/engraphis.ico">
77
<link rel="icon" type="image/png" sizes="32x32" href="/classic-assets/favicon-32.png">
88
<title>Engraphis</title>
9-
<link rel="stylesheet" href="/classic-assets/dashboard.css?v=20260815-merge-ready-1">
9+
<link rel="stylesheet" href="/classic-assets/dashboard.css?v=20260831-galaxy-floor-fix-2">
1010
</head>
1111
<body>
1212
<a class="skip-link" href="#main-content">Skip to main content</a>

‎engraphis/dashboard_assets/engraphis-graph.js‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
systems is owned by the independent local-stellar well and the rigid event-horizon
142142
contact layers, neither of which depends on this constant. */
143143
const GALAXY_GLOBAL_GRAVITY_FLOOR_SETTING = 24;
144+
const GALAXY_STELLAR_GRAVITY_FLOOR_SETTING = 48;
144145
function galaxyBlackHoleGravitySetting(setting, explicitGlobal) {
145146
const raw = Number(setting);
146147
const value = Number.isFinite(raw) ? Math.max(0, Math.min(GALAXY_GRAVITY_MAXIMUM, raw)) : 0;
@@ -177,8 +178,9 @@
177178
const GALAXY_FIXED_LOCAL_GRAVITY_SETTING = 48;
178179
function galaxyStellarGravitySetting(setting) {
179180
const raw = Number(setting);
180-
return Number.isFinite(raw)
181+
const value = Number.isFinite(raw)
181182
? Math.max(0, Math.min(GALAXY_GRAVITY_MAXIMUM, raw)) : 0;
183+
return Math.max(GALAXY_STELLAR_GRAVITY_FLOOR_SETTING, value);
182184
}
183185
function galaxyStellarGravityConstant(setting) {
184186
return galaxyLocalGravityConstant(galaxyStellarGravitySetting(setting))
@@ -1899,10 +1901,15 @@
18991901
repulsionPadding, repulsionRange, repulsionAcceleration,
19001902
maximumAcceleration: 0, capScale: 1,
19011903
gravitySetting: galaxyAccelerationCapReference(opts.gravity),
1904+
stellarGravityFloorSetting: GALAXY_STELLAR_GRAVITY_FLOOR_SETTING,
1905+
stellarGravity: galaxyStellarGravityConstant(localGravitySetting)
1906+
* galaxyPhysicsMultiplier(opts.localGravitationalConstant,
1907+
GALAXY_LOCAL_GRAVITATIONAL_CONSTANT_MULTIPLIER, 8),
19021908
localGravitationalConstant: galaxyPhysicsMultiplier(
19031909
opts.localGravitationalConstant,
19041910
GALAXY_LOCAL_GRAVITATIONAL_CONSTANT_MULTIPLIER, 8),
19051911
eligibleStellarAnchors: 0, fallbackAnchors: 0, globalAnchors: 0,
1912+
stellarFloorActive: false,
19061913
};
19071914
if (!(alphaValue > 0)) return stats;
19081915
groups.forEach(members => {
@@ -1912,6 +1919,10 @@
19121919
stats.anchors++;
19131920
if (anchor.anchor_role === 'community') {
19141921
stats.eligibleStellarAnchors++;
1922+
if (Number.isFinite(Number(localGravitySetting))
1923+
&& Number(localGravitySetting) < GALAXY_STELLAR_GRAVITY_FLOOR_SETTING) {
1924+
stats.stellarFloorActive = true;
1925+
}
19151926
} else if (anchor.anchor_role === 'global') stats.globalAnchors++;
19161927
else stats.fallbackAnchors++;
19171928
const gravityMultiplier = galaxyLocalGravityMultiplier(anchor, opts);
@@ -10770,6 +10781,8 @@
1077010781
galaxyBlackHoleGravityConstant, galaxyBlackHoleGravitySetting,
1077110782
galaxyCarrierTargetSpeed, galaxyAuthoredCarrierTargetSpeed,
1077210783
galaxyBlackHoleSpinAngle, advanceGalaxyBlackHoleSpin,
10784+
galaxyGlobalGravityFloorSetting: GALAXY_GLOBAL_GRAVITY_FLOOR_SETTING,
10785+
galaxyStellarGravityFloorSetting: GALAXY_STELLAR_GRAVITY_FLOOR_SETTING,
1077310786
galaxyLocalGravityConstant,
1077410787
galaxyLocalGravityMultiplier,
1077510788
galaxyStellarGravityConstant, galaxyFallbackStellarGravityConstant,

‎engraphis/dashboard_assets/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="description" content="Engraphis Ledger — local-first, grounded memory operations.">
88
<title>Engraphis Ledger</title>
99
<link rel="icon" type="image/png" sizes="32x32" href="/v2-assets/favicon-32.png">
10-
<link rel="stylesheet" href="/v2-assets/ledger.css?v=20260831-galaxy-floor-fix-2">
10+
<link rel="stylesheet" href="/v2-assets/ledger.css?v=20260902-slider-merge-1">
1111
</head>
1212
<body data-theme="slate">
1313
<a class="skip-link" href="#main-content">Skip to main content</a>
@@ -708,6 +708,6 @@ <h2 id="graph-connections-title">Connected nodes</h2>
708708
</form>
709709
</dialog>
710710

711-
<script src="/v2-assets/ledger.js?v=20260831-galaxy-floor-fix-2"></script>
711+
<script src="/v2-assets/ledger.js?v=20260902-slider-merge-1"></script>
712712
</body>
713713
</html>

‎engraphis/dashboard_assets/ledger.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@
458458
graphAssetSource('/v2-assets/vendor/force-graph.min.js?v=20260727-final'),
459459
'ForceGraph', controller.signal,
460460
)).then(() => loadScript(
461-
graphAssetSource('/v2-assets/engraphis-graph.js?v=20260831-galaxy-floor-fix-2'),
461+
graphAssetSource('/v2-assets/engraphis-graph.js?v=20260902-slider-merge-1'),
462462
'EngraphisGraph', controller.signal,
463463
)).then(() => loadScript(
464464
graphAssetSource('/v2-assets/engraphis-spacetime.js?v=20260812-stable-orbit-lanes-7'),

‎engraphis/static/dashboard.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/e2e/ledger.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,14 +580,14 @@ test('Ledger cache-busts a graph renderer that fetched but did not register', as
580580
await expect(page.locator('#graph-empty')).toContainText('Graph unavailable');
581581
expect(rendererRequests).toHaveLength(1);
582582
const first = new URL(rendererRequests[0]);
583-
expect(first.searchParams.get('v')).toBe('20260831-galaxy-floor-fix-2');
583+
expect(first.searchParams.get('v')).toBe('20260902-slider-merge-1');
584584
expect(first.searchParams.has('retry')).toBe(false);
585585

586586
await page.getByRole('button', { name: 'Reload data' }).click();
587587
await expect(page.locator('#graph-count')).toContainText('3 entities · 1 relations');
588588
expect(rendererRequests).toHaveLength(2);
589589
const second = new URL(rendererRequests[1]);
590-
expect(second.searchParams.get('v')).toBe('20260831-galaxy-floor-fix-2');
590+
expect(second.searchParams.get('v')).toBe('20260902-slider-merge-1');
591591
expect(second.searchParams.get('retry')).toBe('1');
592592
});
593593

0 commit comments

Comments
 (0)