amalgm 0.1.131-canary.20260625234755 → 0.1.131

package/lib/cli.js

@@ -1051,10 +1051,7 @@ async function status() {
   if (record?.webhook_url) console.log(`Events: ${record.webhook_url}`);
   if (record?.tunnel_url) console.log(`Tunnel: ${record.tunnel_url}`);
   if (record?.tunnel_token) {
-    const defaultChatTunnel = AMALGM_RUNTIME_LABEL === 'main'
-      ? 'wss://amalgm-chat-gateway.fly.dev/wire'
-      : 'wss://chat.preview.amalgm.ai/wire';
-    console.log(`Chat tunnel: ${record.chat_tunnel_url || defaultChatTunnel}`);
+    console.log(`Chat tunnel: ${record.chat_tunnel_url || 'wss://amalgm-chat-gateway.fly.dev/wire'}`);
   }
   console.log(`HMAC proxy: ${proxyTokenFromRecord(record) ? 'configured' : 'not configured'}`);
 

package/lib/paths.js

@@ -49,8 +49,7 @@ const SERVICE_PID_FILE = path.join(AMALGM_RUNTIME_STATE_DIR, 'amalgm-service.pid
 const SERVICE_STATE_FILE = path.join(AMALGM_RUNTIME_STATE_DIR, 'service-state.json');
 const SERVICE_STOP_FILE = path.join(AMALGM_RUNTIME_STATE_DIR, 'amalgm-service.stop');
 const SHUTDOWN_REASON_FILE = path.join(AMALGM_RUNTIME_STATE_DIR, 'shutdown-reason.json');
-const DEFAULT_APP_URL = process.env.AMALGM_APP_URL
-  || (AMALGM_RUNTIME_LABEL === 'main' ? 'https://amalgm.ai' : 'https://preview.amalgm.ai');
+const DEFAULT_APP_URL = process.env.AMALGM_APP_URL || 'https://amalgm.ai';
 
 module.exports = {
   AMALGM_BRANCH,

package/lib/tunnel-chat.js

@@ -16,11 +16,7 @@ const DEFAULT_PORT_MONITOR_PORT = runtimeServiceByName('port-monitor').defaultPo
 const DEFAULT_MCP_PORT = runtimeServiceByName('amalgm-mcp').defaultPort;
 const DEFAULT_CHAT_SERVER_PORT = runtimeServiceByName('chat-server').defaultPort;
 const DEFAULT_TARGET_PORT = DEFAULT_CHAT_SERVER_PORT;
-function defaultChatTunnelUrl() {
-  return AMALGM_RUNTIME_LABEL === 'main'
-    ? 'wss://amalgm-chat-gateway.fly.dev/wire'
-    : 'wss://chat.preview.amalgm.ai/wire';
-}
+const DEFAULT_CHAT_TUNNEL_URL = 'wss://amalgm-chat-gateway.fly.dev/wire';
 const CONNECT_TIMEOUT_MS = 20_000;
 const WATCHDOG_INTERVAL_MS = 15_000;
 const HEARTBEAT_TIMEOUT_MS = 75_000;
@@ -77,7 +73,7 @@ const HOP_BY_HOP_HEADERS = new Set([
 ]);
 
 function tunnelUrl(rawUrl) {
-  const url = new URL(rawUrl || defaultChatTunnelUrl());
+  const url = new URL(rawUrl || DEFAULT_CHAT_TUNNEL_URL);
   url.searchParams.delete('token');
   return url.toString();
 }

package/package.json

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

package/runtime/scripts/amalgm-mcp/config.js

@@ -52,21 +52,9 @@ const DEFAULT_CWD = process.env.AMALGM_DEFAULT_CWD || os.homedir();
 const AMALGM_USER_ID = process.env.AMALGM_USER_ID || '';
 const AMALGM_COMPUTER_ID = process.env.AMALGM_COMPUTER_ID || process.env.AMALGM_CONTAINER_ID || '';
 
-function usesPreviewInfraDefaults() {
-  const raw = String(
-    process.env.AMALGM_RUNTIME_LABEL
-    || process.env.AMALGM_CHANNEL
-    || process.env.AMALGM_BRANCH
-    || '',
-  ).trim().toLowerCase();
-  return ['preview', 'canary', 'native-chat', 'staging', 'local', 'dev', 'development'].includes(raw);
-}
-
 const PROXY_TOKEN = process.env.AMALGM_PROXY_TOKEN
   || (process.env.AMALGM_RUNTIME_SOURCE === 'npm' ? '' : process.env.ANTHROPIC_API_KEY || '');
-const DEFAULT_PROXY_BASE_URL = usesPreviewInfraDefaults()
-  ? 'https://api.preview.amalgm.ai'
-  : 'https://amalgm-api-proxy-v2.fly.dev';
+const DEFAULT_PROXY_BASE_URL = 'https://amalgm-api-proxy-v2.fly.dev';
 const PROXY_BASE_URL = process.env.AMALGM_PROXY_URL || (PROXY_TOKEN ? DEFAULT_PROXY_BASE_URL : '');
 const SUPABASE_PROXY_URL = PROXY_BASE_URL ? `${PROXY_BASE_URL}/supabase` : '';
 
@@ -91,14 +79,14 @@ const APPS_DOMAIN = (
   || process.env.NEXT_PUBLIC_APPS_DOMAIN
   || process.env.AMALGM_ARTIFACTS_DOMAIN
   || process.env.NEXT_PUBLIC_ARTIFACTS_DOMAIN
-  || (usesPreviewInfraDefaults() ? 'apps.preview.amalgm.ai' : 'apps.amalgm.ai')
+  || 'apps.amalgm.ai'
 );
 const APP_PORT_MIN = parseInt(process.env.AMALGM_APP_PORT_MIN || process.env.AMALGM_ARTIFACT_PORT_MIN || '9100', 10);
 const APP_PORT_MAX = parseInt(process.env.AMALGM_APP_PORT_MAX || process.env.AMALGM_ARTIFACT_PORT_MAX || '9199', 10);
 const GATEWAY_BASE_URL = (
   process.env.AMALGM_GATEWAY_INTERNAL_URL
   || process.env.AMALGM_GATEWAY_URL
-  || (usesPreviewInfraDefaults() ? 'https://wire.events.preview.amalgm.ai' : 'https://wire.events.amalgm.ai')
+  || 'https://wire.events.amalgm.ai'
 ).replace(/\/$/, '');
 const GATEWAY_INTERNAL_SECRET =
   process.env.AMALGM_GATEWAY_INTERNAL_SECRET

package/runtime/scripts/amalgm-mcp/index.js

@@ -56,7 +56,7 @@ async function ensureProxyToken() {
   const adminSecret = process.env.PROXY_ADMIN_SECRET || process.env.ADMIN_SECRET;
   if (!adminSecret) return;
 
-  const proxyUrl = process.env.AMALGM_PROXY_URL || DEFAULT_PROXY_BASE_URL;
+  const proxyUrl = process.env.AMALGM_PROXY_URL || 'https://amalgm-api-proxy-v2.fly.dev';
 
   try {
     const res = await fetch(`${proxyUrl}/internal/token`, {

package/runtime/scripts/chat-core/contract.js

@@ -3,7 +3,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { AMALGM_DIR, DEFAULT_CWD, DEFAULT_PROXY_BASE_URL, PROXY_BASE_URL, PROXY_TOKEN } = require('../chat-server/config');
+const { AMALGM_DIR, DEFAULT_CWD, PROXY_BASE_URL, PROXY_TOKEN } = require('../chat-server/config');
 const { canonicalProjectPath } = require('../lib/project-paths');
 const { authEnvelope, coerceAuth, fingerprint } = require('./auth');
 const { runtimePort } = require('../../lib/runtime-manifest');
@@ -427,7 +427,7 @@ function createContract(payload, options = {}) {
     sessionId,
     localBaseUrl,
     proxyToken: options.proxyToken || PROXY_TOKEN,
-    proxyBaseUrl: options.proxyBaseUrl || PROXY_BASE_URL || DEFAULT_PROXY_BASE_URL,
+    proxyBaseUrl: options.proxyBaseUrl || PROXY_BASE_URL || 'https://amalgm-api-proxy-v2.fly.dev',
     amalgmDir: options.amalgmDir || AMALGM_DIR || path.join(process.env.HOME || '.', '.amalgm'),
     userId,
     credentialId: payload.credentialId || payload.byokCredentialId || null,

package/runtime/scripts/chat-core/server.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const http = require('http');
-const { PORT, DEFAULT_PROXY_BASE_URL, PROXY_BASE_URL, ensureFreshProxyToken } = require('../chat-server/config');
+const { PORT, PROXY_BASE_URL, ensureFreshProxyToken } = require('../chat-server/config');
 const db = require('../chat-server/db');
 const { CodexAdapter } = require('./adapters/codex');
 const { ClaudeAdapter } = require('./adapters/claude');
@@ -107,7 +107,7 @@ function createServer(core = createCore()) {
           res,
           contract,
           turn: core.turns.active(route.sessionId),
-          proxyBaseUrl: PROXY_BASE_URL || DEFAULT_PROXY_BASE_URL,
+          proxyBaseUrl: PROXY_BASE_URL || 'https://amalgm-api-proxy-v2.fly.dev',
           proxyToken,
           upstreamPath: `${route.upstreamPath}${route.search || ''}`,
         });

package/runtime/scripts/chat-server/config.js

@@ -100,7 +100,6 @@ module.exports = {
   PROXY_TOKEN,
   ensureFreshProxyToken,
   readProxyToken,
-  DEFAULT_PROXY_BASE_URL,
   PROXY_BASE_URL,
   OPENAI_PROXY_URL,
   AI_GATEWAY_PROXY_URL,

package/runtime/scripts/chat-server.js

@@ -31,8 +31,7 @@ async function boot() {
     }
     const adminSecret = process.env.PROXY_ADMIN_SECRET || process.env.ADMIN_SECRET;
     if (adminSecret) {
-      const { DEFAULT_PROXY_BASE_URL } = require('./proxy-token-store');
-      const proxyUrl = process.env.AMALGM_PROXY_URL || DEFAULT_PROXY_BASE_URL;
+      const proxyUrl = process.env.AMALGM_PROXY_URL || 'https://amalgm-api-proxy-v2.fly.dev';
       try {
         const userId = process.env.AMALGM_USER_ID || process.env.USER_ID || process.env.NEXT_PUBLIC_AMALGM_USER_ID || '';
         const containerId = process.env.AMALGM_CONTAINER_ID || 'standalone';

package/runtime/scripts/proxy-token-store.js

@@ -4,19 +4,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-function usesPreviewInfraDefaults() {
-  const raw = String(
-    process.env.AMALGM_RUNTIME_LABEL
-    || process.env.AMALGM_CHANNEL
-    || process.env.AMALGM_BRANCH
-    || '',
-  ).trim().toLowerCase();
-  return ['preview', 'canary', 'native-chat', 'staging', 'local', 'dev', 'development'].includes(raw);
-}
-
-const DEFAULT_PROXY_BASE_URL = usesPreviewInfraDefaults()
-  ? 'https://api.preview.amalgm.ai'
-  : 'https://amalgm-api-proxy-v2.fly.dev';
+const DEFAULT_PROXY_BASE_URL = 'https://amalgm-api-proxy-v2.fly.dev';
 const REFRESH_BUFFER_MS = 10 * 60 * 1000;
 
 const AMALGM_DIR = process.env.AMALGM_DIR || path.join(os.homedir(), '.amalgm');