amalgm 0.1.145 → 0.1.146

package/lib/service.js

@@ -248,7 +248,7 @@ function runningInContainer() {
   if (fs.existsSync('/.dockerenv') || fs.existsSync('/run/.containerenv')) return true;
   try {
     const cgroup = fs.readFileSync('/proc/1/cgroup', 'utf8');
-    return /docker|kubepods|containerd|libpod|lxc|daytona|e2b/i.test(cgroup);
+    return /docker|kubepods|containerd|libpod|lxc|e2b/i.test(cgroup);
   } catch {
     return false;
   }

package/lib/supervisor.js

@@ -86,6 +86,11 @@ const CHILD_HEALTH_POLICY = {
   maxFailures: 3,
 };
 
+const CHAT_SERVER_HEALTH_POLICY = {
+  timeoutMs: 15000,
+  maxFailures: 6,
+};
+
 const AUTO_UPDATE_POLICY = {
   checkIntervalMs: 15 * 60_000,
   initialDelayMs: 60_000,
@@ -289,19 +294,30 @@ function baseRuntimeEnv(record, ports, options = {}) {
 
 function serviceSpecs(record, ports, options = {}) {
   const env = baseRuntimeEnv(record, ports, options);
-  return runtimeLaunchServices().map((service) => ({
-    name: service.name,
-    command: process.execPath,
-    args: [runtimeEntry(service.script), RUNTIME_INSTANCE_ARG],
-    env: service.name === 'port-monitor' ? { ...env, PORT: process.env.PORT || '0' } : env,
-    port: ports[service.portKey],
-    healthPath: '/healthz',
-    expectedRuntimeInstanceId: AMALGM_RUNTIME_INSTANCE_ID,
-    expectedService: service.name,
-    healthHeaders: env.AMALGM_RUNTIME_TOKEN
-      ? { 'x-amalgm-runtime-token': env.AMALGM_RUNTIME_TOKEN }
-      : {},
-  }));
+  return runtimeLaunchServices().map((service) => {
+    const healthPolicy = healthPolicyForService(service.name);
+    return {
+      name: service.name,
+      command: process.execPath,
+      args: [runtimeEntry(service.script), RUNTIME_INSTANCE_ARG],
+      env: service.name === 'port-monitor' ? { ...env, PORT: process.env.PORT || '0' } : env,
+      port: ports[service.portKey],
+      healthPath: '/healthz',
+      expectedRuntimeInstanceId: AMALGM_RUNTIME_INSTANCE_ID,
+      expectedService: service.name,
+      healthPolicy,
+      healthHeaders: env.AMALGM_RUNTIME_TOKEN
+        ? { 'x-amalgm-runtime-token': env.AMALGM_RUNTIME_TOKEN }
+        : {},
+    };
+  });
+}
+
+function healthPolicyForService(serviceName) {
+  return {
+    ...CHILD_HEALTH_POLICY,
+    ...(serviceName === 'chat-server' ? CHAT_SERVER_HEALTH_POLICY : {}),
+  };
 }
 
 function isPortFree(port, host = '127.0.0.1') {
@@ -983,6 +999,7 @@ function checkServiceHealth(spec, timeoutMs = CHILD_HEALTH_POLICY.timeoutMs) {
 
 function createManagedProcess(spec, options) {
   const { stream } = openServiceLog(spec.name);
+  const healthPolicy = { ...CHILD_HEALTH_POLICY, ...(spec.healthPolicy || {}) };
   let child = null;
   let stopped = false;
   let restartTimer = null;
@@ -1026,12 +1043,12 @@ function createManagedProcess(spec, options) {
   };
 
   const scheduleHealthCheck = () => {
-    const delayMs = state === 'running' ? CHILD_HEALTH_POLICY.intervalMs : 500;
+    const delayMs = state === 'running' ? healthPolicy.intervalMs : 500;
     clearHealthTimer();
     if (stopped) return;
     healthTimer = setTimeout(async () => {
       if (stopped || !child) return;
-      const ok = await checkServiceHealth(spec);
+      const ok = await checkServiceHealth(spec, healthPolicy.timeoutMs);
       if (stopped || !child) return;
       if (ok) {
         healthFailures = 0;
@@ -1040,7 +1057,7 @@ function createManagedProcess(spec, options) {
           settleReady();
         }
       } else {
-        if (Date.now() - startedAt < CHILD_HEALTH_POLICY.graceMs) {
+        if (Date.now() - startedAt < healthPolicy.graceMs) {
           scheduleHealthCheck();
           return;
         }
@@ -1048,10 +1065,10 @@ function createManagedProcess(spec, options) {
         writePrefixed(
           stream,
           spec.name,
-          `health check failed (${healthFailures}/${CHILD_HEALTH_POLICY.maxFailures})\n`,
+          `health check failed (${healthFailures}/${healthPolicy.maxFailures})\n`,
           options.foreground ? process.stderr : null,
         );
-        if (healthFailures >= CHILD_HEALTH_POLICY.maxFailures) {
+        if (healthFailures >= healthPolicy.maxFailures) {
           setState('restarting', { reason: 'health_check_failed' });
           try {
             child.kill('SIGTERM');
@@ -1105,7 +1122,7 @@ function createManagedProcess(spec, options) {
       if (readyTimer) clearTimeout(readyTimer);
       readyTimer = setTimeout(() => {
         settleReady(new Error(`${spec.name} did not become healthy on port ${spec.port}`));
-      }, CHILD_HEALTH_POLICY.graceMs + (CHILD_HEALTH_POLICY.intervalMs * CHILD_HEALTH_POLICY.maxFailures));
+      }, healthPolicy.graceMs + ((healthPolicy.intervalMs + healthPolicy.timeoutMs) * healthPolicy.maxFailures));
     }
     child = spawn(spec.command, spec.args, {
       cwd: RUNTIME_DIR,
@@ -1333,6 +1350,7 @@ async function startSupervisor(options = {}) {
 module.exports = {
   startSupervisor,
   _test: {
+    healthPolicyForService,
     liveDeclaredRuntimePorts,
     runtimeStateFilesUnder,
     runtimeStateSearchRoots,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.145",
+  "version": "0.1.146",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,

package/runtime/scripts/amalgm-mcp/events/desktop-release-runner.js

@@ -719,12 +719,9 @@ function envForBuild(
     ...baseEnv,
     DESKTOP_RELEASE_LANE: request.lane,
     DESKTOP_RELEASE_CHANNEL: request.lane === 'preview' ? 'preview' : 'latest',
-    AMALGM_DESKTOP_THIN: desktopThinRuntimeBuildEnabled(baseEnv) ? '1' : '0',
-    AMALGM_DESKTOP_RENDERER_DELIVERY: desktopRendererDelivery(baseEnv),
-    AMALGM_DESKTOP_RUNTIME_DELIVERY: desktopRuntimeDelivery(baseEnv),
-    ...(desktopRendererDelivery(baseEnv) === 'bundled-next' ? {
-      NEXT_IMAGE_UNOPTIMIZED: '1',
-    } : {}),
+    AMALGM_DESKTOP_RENDERER_DELIVERY: 'bundled-next',
+    AMALGM_DESKTOP_RUNTIME_DELIVERY: 'npm',
+    NEXT_IMAGE_UNOPTIMIZED: '1',
     AMALGM_RUNTIME_LABEL: request.lane === 'preview' ? 'preview' : 'main',
     AMALGM_BRANCH: request.lane,
     ELECTRON_VERSION: version,
@@ -770,33 +767,6 @@ function envForBuild(
   return env;
 }
 
-function desktopThinRuntimeBuildEnabled(env = process.env) {
-  const raw = cleanString(env.AMALGM_DESKTOP_THIN || env.DESKTOP_THIN_BUILD).toLowerCase();
-  if (!raw) return true;
-  if (['1', 'true', 'yes', 'on'].includes(raw)) return true;
-  if (['0', 'false', 'no', 'off'].includes(raw)) return false;
-  throw new Error(`Unsupported AMALGM_DESKTOP_THIN value: ${raw}`);
-}
-
-function desktopRendererDelivery(env = process.env) {
-  const raw = cleanString(
-    env.AMALGM_DESKTOP_RENDERER_DELIVERY
-    || env.AMALGM_DESKTOP_UI_DELIVERY
-    || (cleanString(env.AMALGM_DESKTOP_UI_MODE).toLowerCase() === 'local' ? 'bundled-next' : ''),
-  ).toLowerCase();
-  if (!raw) return desktopThinRuntimeBuildEnabled(env) ? 'hosted' : 'bundled-next';
-  if (['hosted', 'remote', 'web'].includes(raw)) return 'hosted';
-  if (['bundled-next', 'bundled', 'local', 'next', 'local-next'].includes(raw)) return 'bundled-next';
-  throw new Error(`Unsupported AMALGM_DESKTOP_RENDERER_DELIVERY value: ${raw}`);
-}
-
-function desktopRuntimeDelivery(env = process.env) {
-  const raw = cleanString(env.AMALGM_DESKTOP_RUNTIME_DELIVERY).toLowerCase();
-  if (!raw) return desktopThinRuntimeBuildEnabled(env) ? 'npm' : 'bundled-with-npm-handoff';
-  if (['npm', 'managed-npm'].includes(raw)) return 'npm';
-  if (['bundled-with-npm-handoff', 'bundled', 'local', 'embedded'].includes(raw)) return 'bundled-with-npm-handoff';
-  throw new Error(`Unsupported AMALGM_DESKTOP_RUNTIME_DELIVERY value: ${raw}`);
-}
 
 function appOriginForLane(lane, env = process.env) {
   if (lane === 'preview') {
@@ -1802,29 +1772,15 @@ function publishDesktopRelease(request, options = {}) {
   run('git', ['push', 'origin', `refs/tags/v${version}`, '--force'], { cwd: engineDir });
   run('npm', ['version', '--no-git-tag-version', '--allow-same-version', version], { cwd: engineDir, env: releaseEnv });
   run('npm', ['run', 'compile'], { cwd: engineDir, env: releaseEnv });
-  const rendererDelivery = desktopRendererDelivery(releaseEnv);
-  const runtimeDelivery = desktopRuntimeDelivery(releaseEnv);
-  const hostedRenderer = rendererDelivery === 'hosted';
-  const npmRuntime = runtimeDelivery === 'npm';
-  let appOrigin = appOriginForLane(request.lane, releaseEnv);
-  if (hostedRenderer) {
-    console.log('Building hosted-UI desktop shell; skipping bundled Next.js renderer payload.');
-  } else {
-    copyUiIntoEngine(uiDir, engineDir);
-    appOrigin = writeBundledWebEnv(engineDir, request.lane, releaseEnv);
-    run('npm', ['run', 'build:next'], {
-      cwd: engineDir,
-      env: {
-        ...releaseEnv,
-        NEXT_IMAGE_UNOPTIMIZED: '1',
-      },
-    });
-  }
-  if (npmRuntime) {
-    console.log('Building desktop shell with managed npm runtime; skipping bundled engine runtime payload.');
-  } else {
-    run('npm', ['run', 'npm:sync'], { cwd: engineDir, env: releaseEnv });
-  }
+  copyUiIntoEngine(uiDir, engineDir);
+  const appOrigin = writeBundledWebEnv(engineDir, request.lane, releaseEnv);
+  run('npm', ['run', 'build:next'], {
+    cwd: engineDir,
+    env: {
+      ...releaseEnv,
+      NEXT_IMAGE_UNOPTIMIZED: '1',
+    },
+  });
   if (request.lane === 'preview') run('npm', ['run', 'assets:preview-icon'], { cwd: engineDir, env: releaseEnv });
 
   const buildEnv = envForBuild(releaseEnv, request, sourcePackageVersion, version, refs, shas, appOrigin, releaseRepository, publishTarget);

package/runtime/scripts/amalgm-mcp/lib/email-embeds.js

@@ -16,7 +16,7 @@
  */
 
 // GENERATED tokens/chrome — serialized from lib/rendering/tokens.ts and
-// chromeTokens.ts by scripts/amalgm-mcp/generate-email-render-assets.mts.
+// chromeTokens.ts by scripts/email-render/generate-email-render-assets.mts.
 // No hand-mirrored values here: change the canonical file and regenerate.
 const RENDER_ASSETS = require('./generated/email-render.json');
 const TOKENS = RENDER_ASSETS.tokens;

package/runtime/scripts/amalgm-mcp/lib/email-md.js

@@ -21,7 +21,7 @@ const embeds = require('./email-embeds');
 const { buildEmailRenderContext, normalizeEmailLink } = require('./email-deeplinks');
 
 // GENERATED from lib/rendering/tokens.ts by
-// scripts/amalgm-mcp/generate-email-render-assets.mts — the deterministic
+// scripts/email-render/generate-email-render-assets.mts — the deterministic
 // adapter. There is no hand-mirrored token copy anymore; change tokens.ts
 // (or Citation.tsx for the templates below) and regenerate.
 const RENDER_ASSETS = require('./generated/email-render.json');

package/runtime/scripts/amalgm-mcp/lib/generated/email-render.json

@@ -1,5 +1,5 @@
 {
-  "//": "GENERATED by scripts/amalgm-mcp/generate-email-render-assets.mts — do not edit.",
+  "//": "GENERATED by scripts/email-render/generate-email-render-assets.mts — do not edit.",
   "version": 1,
   "tokens": {
     "font": {

package/runtime/scripts/amalgm-mcp/tests/desktop-release-runner.test.js

@@ -246,40 +246,13 @@ test('desktop release runner uses electron-builder compatible signing identity n
   assert.equal(env.AMALGM_DESKTOP_RELEASE_UPLOAD_URL, 'https://amalgm-desktop-releases.fly.dev/');
   assert.equal(env.AMALGM_DESKTOP_RELEASE_FLY_APP, 'amalgm-desktop-releases');
   assert.equal(env.AMALGM_DESKTOP_RELEASE_FLY_ROOT, '/data');
-  assert.equal(env.AMALGM_DESKTOP_THIN, '1');
   assert.equal(env.AMALGM_DESKTOP_NOTARIZE, 'off');
 });
 
-test('desktop release runner preserves explicit bundled desktop builds', () => {
+test('desktop release runner always builds bundled UI with npm runtime', () => {
   const env = envForBuild(
     {
       GH_TOKEN: 'token',
-      AMALGM_DESKTOP_THIN: '0',
-      NEXT_PUBLIC_SUPABASE_URL: 'https://example.supabase.co',
-      NEXT_PUBLIC_SUPABASE_ANON_KEY: 'anon-key',
-    },
-    { lane: 'main', delivery: 'delivery-id' },
-    '0.1.124',
-    '0.1.124000001',
-    { engineRef: 'engine', uiRef: 'ui' },
-    { engineSha: 'engine-sha', uiSha: 'ui-sha' },
-    'https://amalgm.ai',
-  );
-
-  assert.equal(env.AMALGM_DESKTOP_THIN, '0');
-  assert.equal(env.AMALGM_DESKTOP_RENDERER_DELIVERY, 'bundled-next');
-  assert.equal(env.AMALGM_DESKTOP_RUNTIME_DELIVERY, 'bundled-with-npm-handoff');
-  assert.equal(env.NEXT_IMAGE_UNOPTIMIZED, '1');
-  assert.equal(env.NEXT_PUBLIC_SUPABASE_URL, 'https://example.supabase.co');
-  assert.equal(env.NEXT_PUBLIC_SUPABASE_ANON_KEY, 'anon-key');
-});
-
-test('desktop release runner supports bundled UI with npm runtime', () => {
-  const env = envForBuild(
-    {
-      GH_TOKEN: 'token',
-      AMALGM_DESKTOP_RENDERER_DELIVERY: 'bundled-next',
-      AMALGM_DESKTOP_RUNTIME_DELIVERY: 'npm',
       NEXT_PUBLIC_SUPABASE_URL: 'https://example.supabase.co',
       NEXT_PUBLIC_SUPABASE_ANON_KEY: 'anon-key',
     },

package/runtime/scripts/amalgm-mcp/tests/email-render.test.js

@@ -8,7 +8,7 @@
  * email-render-goldens/. The full notification shell is covered once.
  *
  * When output changes on purpose (tokens, chrome, templates, renderer):
- *   UPDATE_GOLDENS=1 node --test scripts/amalgm-mcp/tests/email-render.test.js
+ *   UPDATE_GOLDENS=1 node --test scripts/email-render/tests/email-render.test.js
  * then review the golden diff like any code change.
  */
 

package/runtime/scripts/runtime-auth.js

@@ -91,7 +91,6 @@ function applyRuntimeCors(req, res, options = {}) {
       'Last-Event-ID',
       'Mcp-Session-Id',
       'X-Amalgm-Session-Id',
-      'X-Daytona-Preview-Token',
       RUNTIME_TOKEN_HEADER,
     ].join(', '),
   );