amalgm 0.1.162 → 0.1.163-canary.20260722143753

package/lib/cli.js

@@ -1094,7 +1094,10 @@ 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) {
-    console.log(`Chat tunnel: ${record.chat_tunnel_url || 'wss://amalgm-chat-gateway.fly.dev/wire'}`);
+    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(`HMAC proxy: ${proxyTokenFromRecord(record) ? 'configured' : 'not configured'}`);
 

package/lib/paths.js

@@ -49,7 +49,8 @@ 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 || 'https://amalgm.ai';
+const DEFAULT_APP_URL = process.env.AMALGM_APP_URL
+  || (AMALGM_RUNTIME_LABEL === 'main' ? 'https://amalgm.ai' : 'https://preview.amalgm.ai');
 
 module.exports = {
   AMALGM_BRANCH,

package/lib/tunnel-chat.js

@@ -16,7 +16,11 @@ 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;
-const DEFAULT_CHAT_TUNNEL_URL = 'wss://amalgm-chat-gateway.fly.dev/wire';
+function defaultChatTunnelUrl() {
+  return AMALGM_RUNTIME_LABEL === 'main'
+    ? 'wss://amalgm-chat-gateway.fly.dev/wire'
+    : 'wss://chat.preview.amalgm.ai/wire';
+}
 const CONNECT_TIMEOUT_MS = 20_000;
 const WATCHDOG_INTERVAL_MS = 15_000;
 const HEARTBEAT_TIMEOUT_MS = 75_000;
@@ -73,7 +77,7 @@ const HOP_BY_HOP_HEADERS = new Set([
 ]);
 
 function tunnelUrl(rawUrl) {
-  const url = new URL(rawUrl || DEFAULT_CHAT_TUNNEL_URL);
+  const url = new URL(rawUrl || defaultChatTunnelUrl());
   url.searchParams.delete('token');
   return url.toString();
 }

package/package.json

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

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

@@ -58,9 +58,21 @@ 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 = 'https://amalgm-api-proxy-v2.fly.dev';
+const DEFAULT_PROXY_BASE_URL = usesPreviewInfraDefaults()
+  ? 'https://api.preview.amalgm.ai'
+  : '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` : '';
 
@@ -85,14 +97,14 @@ const APPS_DOMAIN = (
   || process.env.NEXT_PUBLIC_APPS_DOMAIN
   || process.env.AMALGM_ARTIFACTS_DOMAIN
   || process.env.NEXT_PUBLIC_ARTIFACTS_DOMAIN
-  || 'apps.amalgm.ai'
+  || (usesPreviewInfraDefaults() ? 'apps.preview.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
-  || 'https://wire.events.amalgm.ai'
+  || (usesPreviewInfraDefaults() ? 'https://wire.events.preview.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 || 'https://amalgm-api-proxy-v2.fly.dev';
+  const proxyUrl = process.env.AMALGM_PROXY_URL || DEFAULT_PROXY_BASE_URL;
 
   try {
     const res = await fetch(`${proxyUrl}/internal/token`, {

package/runtime/scripts/amalgm-mcp/state/docs.js

@@ -853,9 +853,11 @@ function loadDocEntry(pathInput) {
 function openDoc(pathInput) {
   const Y = loadYjs();
   const entry = loadDocEntry(pathInput);
+  const replica = require('./replicas').getReplicaByLocalResource(entry.resource);
   return {
     resource: entry.resource,
     nodeId: entry.nodeId,
+    cloudResourceId: replica?.resourceId || entry.nodeId || null,
     path: entry.path,
     state: Buffer.from(Y.encodeStateAsUpdate(entry.doc)).toString('base64'),
     // The versioned-write handshake: hash of the exact current text; a writer

package/runtime/scripts/amalgm-mcp/tests/state-shared-replica.test.js

@@ -113,6 +113,7 @@ test('promotion is durable, idempotent, and installs the runtime-owned cloud bin
   assert.equal(replica.localPath, target);
   assert.equal(replica.appliedVersion, 0);
   assert.equal(replica.contract, 'text-yjs@1');
+  assert.equal(docs.openDoc(target).cloudResourceId, resourceId);
 });
 
 test('batched surface edits retain separate IDs/versions and recipient file precedes UI event', () => {

package/runtime/scripts/amalgm-mcp/workspace/wall.js

@@ -96,9 +96,17 @@ function readWall() {
 
 /**
  * Write this machine's line — and only this machine's line — into the
- * wall. Other machines' lines are preserved byte-for-byte in place, so
- * the resulting doc edit is exactly one line's splice and concurrent
- * publishes from other machines never overlap it.
+ * wall. Other machines' parseable lines are preserved byte-for-byte in
+ * place, so the resulting doc edit is exactly one line's splice and
+ * concurrent publishes from other machines never overlap it.
+ *
+ * Lines that do not parse as wall entries are deleted, not preserved: a
+ * garbled line is nobody's line (every writer replaces its own on the
+ * next publish), and keeping it would make corruption permanent — no
+ * writer would ever own the bytes. Deleting it is safe under concurrent
+ * publishes because valid lines are disjoint per machine and the doc
+ * rail merges a delete of garbage with any machine's splice of its own
+ * line.
  */
 function publishWall() {
   const replica = wallReplica();
@@ -116,21 +124,40 @@ function publishWall() {
     cards: listRepoCards(),
   });
 
-  const lines = current.split('\n').filter((line) => line.length > 0);
-  const index = lines.findIndex((line) => parseWallLine(line)?.machine === machineId());
-  const unchanged = index >= 0
-    && withoutPublishedAt(lines[index]) === withoutPublishedAt(mine);
+  const lines = [];
+  let previous = null;
+  let dropped = 0;
+  for (const line of current.split('\n')) {
+    if (!line) continue;
+    const entry = parseWallLine(line);
+    if (!entry) {
+      dropped += 1;
+    } else if (entry.machine === machineId()) {
+      // Duplicate own lines (a healed fork) collapse into the first slot.
+      if (previous === null) {
+        previous = line;
+        lines.push(mine);
+      } else {
+        dropped += 1;
+      }
+    } else {
+      lines.push(line);
+    }
+  }
+  if (previous === null) lines.push(mine);
+
+  const unchanged = dropped === 0
+    && previous !== null
+    && withoutPublishedAt(previous) === withoutPublishedAt(mine);
   if (unchanged) {
     service.counters.publishSkips += 1;
     return { published: false, reason: 'unchanged' };
   }
-  if (index >= 0) lines[index] = mine;
-  else lines.push(mine);
 
   const result = docs.writeDocText(WALL_FILE, `${lines.join('\n')}\n`, { baseHash: sha256(current) });
   service.counters.publishes += 1;
   service.lastPublishedAt = new Date().toISOString();
-  return { published: true, merge: result.merge, cards: listRepoCards().length };
+  return { published: true, merge: result.merge, cards: listRepoCards().length, dropped };
 }
 
 function withoutPublishedAt(line) {

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, PROXY_BASE_URL, PROXY_TOKEN } = require('../chat-server/config');
+const { AMALGM_DIR, DEFAULT_CWD, DEFAULT_PROXY_BASE_URL, 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');

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

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

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

@@ -100,6 +100,7 @@ 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,7 +31,8 @@ async function boot() {
     }
     const adminSecret = process.env.PROXY_ADMIN_SECRET || process.env.ADMIN_SECRET;
     if (adminSecret) {
-      const proxyUrl = process.env.AMALGM_PROXY_URL || 'https://amalgm-api-proxy-v2.fly.dev';
+      const { DEFAULT_PROXY_BASE_URL } = require('./proxy-token-store');
+      const proxyUrl = process.env.AMALGM_PROXY_URL || DEFAULT_PROXY_BASE_URL;
       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,7 +4,19 @@ const fs = require('fs');
 const path = require('path');
 const { amalgmDir, runtimeStateDir } = require('./lib/runtime-paths');
 
-const DEFAULT_PROXY_BASE_URL = 'https://amalgm-api-proxy-v2.fly.dev';
+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 REFRESH_BUFFER_MS = 10 * 60 * 1000;
 
 const AMALGM_DIR = amalgmDir();