amalgm 0.1.56 → 0.1.57

package/lib/cli.js

@@ -12,6 +12,7 @@ const { spawn, spawnSync } = require('child_process');
 const {
   AMALGM_DIR,
   AMALGM_BRANCH,
+  AMALGM_HOME,
   DEFAULT_APP_URL,
   DEVICE_FILE,
   LOG_DIR,
@@ -271,6 +272,27 @@ async function ensureDevice() {
     return existing;
   }
 
+  const candidates = [
+    path.join(AMALGM_HOME, 'device.json'),
+    path.join(AMALGM_DIR, 'device.json'),
+    path.join(AMALGM_HOME, 'computer.json'),
+    path.join(AMALGM_DIR, 'computer.json'),
+  ];
+  for (const candidate of candidates) {
+    if (path.resolve(candidate) === path.resolve(DEVICE_FILE)) continue;
+    const found = readJson(candidate, null);
+    if (found && typeof found.device_id === 'string' && found.device_id.length >= 8) {
+      const migrated = {
+        device_id: found.device_id,
+        created_at: typeof found.created_at === 'string' ? found.created_at : new Date().toISOString(),
+        migrated_from: candidate,
+        migrated_at: new Date().toISOString(),
+      };
+      writeJsonSecret(DEVICE_FILE, migrated);
+      return migrated;
+    }
+  }
+
   const device = {
     device_id: `npm-${crypto.randomUUID()}`,
     created_at: new Date().toISOString(),
@@ -515,6 +537,8 @@ async function registerComputer(appUrl, registrationToken, device, name) {
       name,
       platform: platformName(),
       app_version: PACKAGE_VERSION,
+      runtime_label: AMALGM_RUNTIME_LABEL,
+      branch: AMALGM_BRANCH,
     }),
   });
 
@@ -578,6 +602,8 @@ async function loginWithSetupCode(appUrl, setupCode, device, name) {
       name,
       platform: platformName(),
       app_version: PACKAGE_VERSION,
+      runtime_label: AMALGM_RUNTIME_LABEL,
+      branch: AMALGM_BRANCH,
     }),
   });
 
@@ -629,6 +655,8 @@ async function startCliLogin(appUrl, device, name, options) {
       name,
       platform: platformName(),
       app_version: PACKAGE_VERSION,
+      runtime_label: AMALGM_RUNTIME_LABEL,
+      branch: AMALGM_BRANCH,
     }),
   });
 
@@ -677,6 +705,8 @@ async function startCliLogin(appUrl, device, name, options) {
           name,
           platform: platformName(),
           app_version: PACKAGE_VERSION,
+          runtime_label: AMALGM_RUNTIME_LABEL,
+          branch: AMALGM_BRANCH,
         }),
       });
     } catch (error) {

package/lib/paths.js

@@ -28,7 +28,9 @@ const AMALGM_DIR = process.env.AMALGM_DIR
   : scopedAmalgmDir(AMALGM_HOME, AMALGM_RUNTIME_USER_SCOPE, AMALGM_RUNTIME_LABEL);
 const AMALGM_RUNTIME_INSTANCE_ID = process.env.AMALGM_RUNTIME_INSTANCE_ID
   || runtimeInstanceIdForDir(AMALGM_DIR);
-const DEVICE_FILE = path.join(AMALGM_DIR, 'device.json');
+// Physical machine identity is intentionally shared across runtime labels.
+// Runtime credentials/state below remain scoped by user + label.
+const DEVICE_FILE = path.join(AMALGM_HOME, 'device.json');
 const COMPUTER_FILE = path.join(AMALGM_DIR, 'computer.json');
 const AUTH_FILE = path.join(AMALGM_DIR, 'auth.json');
 const RUNTIME_TOKEN_FILE = path.join(AMALGM_DIR, 'runtime-token.json');

package/lib/tunnel-chat.js

@@ -4,7 +4,11 @@ const http = require('http');
 const fs = require('fs');
 const os = require('os');
 const { WebSocket } = require('ws');
-const { RUNTIME_STATE_FILE } = require('./paths');
+const {
+  AMALGM_BRANCH,
+  AMALGM_RUNTIME_LABEL,
+  RUNTIME_STATE_FILE,
+} = require('./paths');
 const { runtimePort, runtimeServiceByName } = require('./runtime-manifest');
 
 const DEFAULT_TARGET_PORT = runtimeServiceByName('chat-server').defaultPort;
@@ -157,6 +161,8 @@ function createChatTunnel({ record, foreground = false }) {
       send({
         type: 'hello',
         app_version: require('../package.json').version,
+        runtime_label: record.runtime_label || AMALGM_RUNTIME_LABEL,
+        branch: record.branch || AMALGM_BRANCH,
         runtime_gateway_port: runtimeGatewayPort(),
       });
 

package/lib/tunnel-events.js

@@ -6,7 +6,12 @@ const os = require('os');
 const path = require('path');
 const { WebSocket } = require('ws');
 
-const { AMALGM_DIR, RUNTIME_STATE_FILE } = require('./paths');
+const {
+  AMALGM_BRANCH,
+  AMALGM_DIR,
+  AMALGM_RUNTIME_LABEL,
+  RUNTIME_STATE_FILE,
+} = require('./paths');
 const { runtimePort, runtimeServiceByName } = require('./runtime-manifest');
 
 const DEFAULT_TARGET_PORT = runtimeServiceByName('amalgm-mcp').defaultPort;
@@ -66,6 +71,8 @@ async function postPresence(record, online) {
       body: JSON.stringify({
         computer_id: record.computer_id,
         device_id: record.device_id || '',
+        runtime_label: record.runtime_label || AMALGM_RUNTIME_LABEL,
+        branch: record.branch || AMALGM_BRANCH,
         online,
       }),
     });
@@ -275,6 +282,8 @@ function createEventTunnel({ record, foreground = false }) {
       send({
         type: 'hello',
         app_version: require('../package.json').version,
+        runtime_label: record.runtime_label || AMALGM_RUNTIME_LABEL,
+        branch: record.branch || AMALGM_BRANCH,
         runtime_gateway_port: runtimeGatewayPort(),
         app_routes: appRoutes,
         artifact_routes: legacyArtifactRoutes(appRoutes),

package/package.json

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