amalgm 0.0.1 → 0.0.33

package/README.md

@@ -9,6 +9,9 @@ amalgm doctor
 amalgm start
 ```
 
+To move an existing install to the newest published build, run `amalgm update --tag canary`.
+Set `AMALGM_AUTO_UPDATE=1` when running `amalgm start` to let the CLI update itself before launching if its current dist-tag has moved.
+
 `amalgm login` opens a browser approval page, then registers the machine and stores its local tunnel/computer record in `~/.amalgm/computer.json`.
 
 If you start from the Amalgm web app or are setting up a remote/headless machine, create a setup code from the web app and run:
@@ -34,6 +37,7 @@ Useful commands:
 
 ```sh
 amalgm status
+amalgm update --tag canary
 amalgm logs
 amalgm logs chat-server
 amalgm stop

package/lib/cli.js

@@ -7,7 +7,7 @@ const net = require('net');
 const os = require('os');
 const path = require('path');
 const readline = require('readline');
-const { spawn } = require('child_process');
+const { spawn, spawnSync } = require('child_process');
 
 const {
   AMALGM_DIR,
@@ -79,11 +79,13 @@ function usage() {
     '  amalgm stop',
     '  amalgm status',
     '  amalgm doctor',
+    '  amalgm update [--tag latest|canary]',
     '  amalgm logs [service]',
     '  amalgm logout',
     '',
     'Environment:',
     '  AMALGM_APP_URL        Web app base URL for login/register',
+    '  AMALGM_AUTO_UPDATE    Set to 1 to update before start when a newer dist-tag exists',
     '  AMALGM_DIR            Runtime state dir (default ~/.amalgm)',
     '  AMALGM_PROXY_TOKEN    Optional short-lived proxy token override',
   ].join('\n');
@@ -178,12 +180,14 @@ const SAFE_DAEMON_ENV_KEYS = [
   'AMALGM_NATIVE_NODE_MODULES',
   'AMALGM_SKIP_NATIVE_INSTALL',
   'CHAT_SERVER_PORT',
+  'ELECTRON_RUN_AS_NODE',
   'FS_WATCHER_PORT',
   'FS_WATCHER_ROOT',
   'HOME',
   'LANG',
   'LC_ALL',
   'LOGNAME',
+  'NODE_PATH',
   'PATH',
   'PORT_MONITOR_PORT',
   'SHELL',
@@ -367,6 +371,91 @@ function commandExists(command) {
   });
 }
 
+function parseSemver(value) {
+  const [core, prerelease = ''] = String(value || '').trim().replace(/^v/, '').split('-', 2);
+  const parts = core.split('.').map((part) => Number.parseInt(part, 10));
+  return {
+    major: Number.isFinite(parts[0]) ? parts[0] : 0,
+    minor: Number.isFinite(parts[1]) ? parts[1] : 0,
+    patch: Number.isFinite(parts[2]) ? parts[2] : 0,
+    prerelease: prerelease ? prerelease.split('.') : [],
+  };
+}
+
+function comparePrerelease(left, right) {
+  if (left.length === 0 && right.length === 0) return 0;
+  if (left.length === 0) return 1;
+  if (right.length === 0) return -1;
+
+  const length = Math.max(left.length, right.length);
+  for (let i = 0; i < length; i += 1) {
+    const a = left[i];
+    const b = right[i];
+    if (a === undefined) return -1;
+    if (b === undefined) return 1;
+    const aNum = /^\d+$/.test(a) ? Number.parseInt(a, 10) : null;
+    const bNum = /^\d+$/.test(b) ? Number.parseInt(b, 10) : null;
+    if (aNum !== null && bNum !== null && aNum !== bNum) return aNum > bNum ? 1 : -1;
+    if (aNum !== null && bNum === null) return -1;
+    if (aNum === null && bNum !== null) return 1;
+    if (a !== b) return a > b ? 1 : -1;
+  }
+  return 0;
+}
+
+function compareVersions(left, right) {
+  const a = parseSemver(left);
+  const b = parseSemver(right);
+  for (const key of ['major', 'minor', 'patch']) {
+    if (a[key] !== b[key]) return a[key] > b[key] ? 1 : -1;
+  }
+  return comparePrerelease(a.prerelease, b.prerelease);
+}
+
+function npmCommand() {
+  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
+
+function npmInstallTag(options = {}) {
+  const explicit = options.tag || options.channel;
+  if (explicit && explicit !== true) return String(explicit).replace(/^@/, '');
+  return PACKAGE_VERSION.includes('-canary.') ? 'canary' : 'latest';
+}
+
+function npmPackageVersionForTag(tag) {
+  const result = spawnSync(npmCommand(), ['view', `amalgm@${tag}`, 'version', '--json'], {
+    encoding: 'utf8',
+    timeout: 15000,
+    env: {
+      ...process.env,
+      npm_config_audit: 'false',
+      npm_config_fund: 'false',
+    },
+  });
+  if (result.status !== 0) {
+    const detail = String(result.stderr || result.stdout || '').trim();
+    throw new Error(`Could not check npm dist-tag "${tag}". ${detail}`);
+  }
+
+  const raw = String(result.stdout || '').trim();
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return raw.replace(/^"|"$/g, '');
+  }
+}
+
+function installNpmPackageTag(tag) {
+  return spawnSync(npmCommand(), ['install', '-g', `amalgm@${tag}`], {
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      npm_config_audit: 'false',
+      npm_config_fund: 'false',
+    },
+  });
+}
+
 function openBrowser(url) {
   const command =
     process.platform === 'darwin'
@@ -671,8 +760,50 @@ function ensureAgentRuntimeCommands(options = {}) {
   }
 }
 
+async function update(options = {}) {
+  const tag = npmInstallTag(options);
+  const targetVersion = npmPackageVersionForTag(tag);
+  if (!targetVersion) throw new Error(`npm did not return a version for amalgm@${tag}`);
+
+  if (compareVersions(targetVersion, PACKAGE_VERSION) <= 0) {
+    console.log(`Amalgm is already current for ${tag}: ${PACKAGE_VERSION}`);
+    return false;
+  }
+
+  console.log(`Updating Amalgm from ${PACKAGE_VERSION} to ${targetVersion} (${tag}).`);
+  const result = installNpmPackageTag(tag);
+  if (result.status !== 0) {
+    throw new Error(`npm install -g amalgm@${tag} failed with status ${result.status ?? result.signal ?? 'unknown'}`);
+  }
+
+  console.log(`Amalgm updated to ${targetVersion}.`);
+  const pid = readPid();
+  if (isPidRunning(pid)) {
+    console.log('A previous Amalgm daemon is still running. Run `amalgm stop && amalgm start` to restart it with the new package.');
+  }
+  return true;
+}
+
+async function updateBeforeStartIfRequested(options = {}) {
+  const requested = options['auto-update'] || process.env.AMALGM_AUTO_UPDATE === '1';
+  if (!requested) return false;
+
+  try {
+    return await update(options);
+  } catch (error) {
+    console.warn(`Auto-update skipped: ${error.message}`);
+    return false;
+  }
+}
+
 async function start(options) {
   ensureBaseDirs();
+
+  if (await updateBeforeStartIfRequested(options)) {
+    console.log('Run `amalgm start` again to launch the updated package.');
+    return;
+  }
+
   assertRuntimePresent();
 
   let record = loadComputerRecord({ migrate: true });
@@ -988,6 +1119,7 @@ async function main(argv) {
   if (command === 'stop') return stop();
   if (command === 'status') return status();
   if (command === 'doctor') return doctor();
+  if (command === 'update') return update(options);
   if (command === 'logs') return logs(options, positionals);
   if (command === 'logout') return logout();
 

package/lib/supervisor.js

@@ -87,7 +87,9 @@ const SAFE_PROCESS_ENV_KEYS = [
   'LOGNAME',
   'AMALGM_NATIVE_NODE_MODULES',
   'AMALGM_SKIP_NATIVE_INSTALL',
+  'ELECTRON_RUN_AS_NODE',
   'PATH',
+  'NODE_PATH',
   'SHELL',
   'SSH_AUTH_SOCK',
   'TERM',
@@ -134,7 +136,12 @@ function ensureRuntimeToken() {
 }
 
 function baseRuntimeEnv(record, ports) {
-  const defaultCwd = process.env.AMALGM_DEFAULT_CWD || os.homedir();
+  const workspaceRoot =
+    process.env.AMALGM_WORKSPACES_DIR ||
+    process.env.AMALGM_PROJECTS_DIR ||
+    path.join(AMALGM_DIR, 'workspaces');
+  ensureDir(workspaceRoot);
+  const defaultCwd = process.env.AMALGM_DEFAULT_CWD || workspaceRoot;
   const proxyToken = proxyTokenFromRecord(record);
   const env = {
     ...safeBaseProcessEnv(),
@@ -146,6 +153,8 @@ function baseRuntimeEnv(record, ports) {
     AMALGM_CREATE_AUTH_WATCH_DIRS: process.env.AMALGM_CREATE_AUTH_WATCH_DIRS || 'false',
     AMALGM_DIR,
     AMALGM_RUNTIME_DIR: RUNTIME_DIR,
+    AMALGM_WORKSPACES_DIR: workspaceRoot,
+    AMALGM_PROJECTS_DIR: workspaceRoot,
     AMALGM_DEFAULT_CWD: defaultCwd,
     AMALGM_COMPUTER_ID: record?.computer_id || process.env.AMALGM_COMPUTER_ID || '',
     AMALGM_CONTAINER_ID: record?.computer_id || process.env.AMALGM_CONTAINER_ID || 'local-computer',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.0.1",
+  "version": "0.0.33",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,
@@ -30,6 +30,7 @@
     "@openai/codex": "^0.128.0",
     "@opencode-ai/sdk": "^1.14.29",
     "ai": "^6.0.116",
+    "better-sqlite3": "^12.10.0",
     "cron-parser": "^5.5.0",
     "opencode-ai": "^1.14.35",
     "playwright-core": "^1.59.1",

package/runtime/lib/chatInput.js

@@ -58,6 +58,8 @@ const ChatInputSchema = z.object({
   }).default({}),
   tools: z.object({
     mcpAppIds: z.array(z.string()).default([]),
+    mode: z.enum(['all', 'selected']).default('all'),
+    toolIds: z.array(z.string()).default([]),
   }).default({}),
   execution: z.object({
     cwd: z.string().nullable().optional(),
@@ -222,6 +224,13 @@ function normalizeChatInput(chatInput, legacy = {}) {
     },
     tools: {
       mcpAppIds: uniqueStrings(rawTools.mcpAppIds || legacy.mcpAppIds),
+      mode: rawTools.mode === 'selected' || legacy.toolMode === 'selected' ? 'selected' : 'all',
+      toolIds: uniqueStrings(
+        rawTools.toolIds
+        || rawTools.selectedToolIds
+        || legacy.toolIds
+        || legacy.selectedToolIds,
+      ),
     },
     execution: {
       cwd: resolvedCwd,

package/runtime/lib/local/amalgmStore.js

@@ -32,6 +32,7 @@ var amalgmStore_exports = {};
 __export(amalgmStore_exports, {
   ensureAmalgmDir: () => ensureAmalgmDir,
   getAmalgmDir: () => getAmalgmDir,
+  getAmalgmWorkspaceRoot: () => getAmalgmWorkspaceRoot,
   getHomeDir: () => getHomeDir,
   readResource: () => readResource,
   writeResource: () => writeResource
@@ -40,7 +41,8 @@ module.exports = __toCommonJS(amalgmStore_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_os = __toESM(require("os"));
-var AMALGM_DIR = import_path.default.join(import_os.default.homedir(), ".amalgm");
+var AMALGM_DIR = process.env.AMALGM_DIR || import_path.default.join(import_os.default.homedir(), ".amalgm");
+var AMALGM_WORKSPACE_ROOT = process.env.AMALGM_WORKSPACES_DIR || process.env.AMALGM_PROJECTS_DIR || import_path.default.join(AMALGM_DIR, "workspaces");
 var DIRECTORIES = [
   "",
   // ~/.amalgm/
@@ -58,8 +60,10 @@ var DIRECTORIES = [
   // ~/.amalgm/conversations/
   "conversations/active",
   // ~/.amalgm/conversations/active/
-  "conversations/saved"
+  "conversations/saved",
   // ~/.amalgm/conversations/saved/
+  "workspaces"
+  // ~/.amalgm/workspaces/
 ];
 var DEFAULT_FILES = {
   "config.json": {
@@ -115,6 +119,9 @@ function writeResource(resourcePath, data) {
 function getAmalgmDir() {
   return AMALGM_DIR;
 }
+function getAmalgmWorkspaceRoot() {
+  return AMALGM_WORKSPACE_ROOT;
+}
 function getHomeDir() {
   return import_os.default.homedir();
 }
@@ -122,6 +129,7 @@ function getHomeDir() {
 0 && (module.exports = {
   ensureAmalgmDir,
   getAmalgmDir,
+  getAmalgmWorkspaceRoot,
   getHomeDir,
   readResource,
   writeResource

package/runtime/scripts/amalgm-mcp/agents/rest.js

@@ -2,12 +2,12 @@
  * /agents/* REST routes (UI-only, not MCP tools).
  */
 
-const crypto = require('crypto');
 const {
-  loadAgents,
-  saveAgents,
+  createAgent,
+  deleteAgent,
   getAllAgentsWithBuiltins,
   resolveAgent,
+  updateAgent,
 } = require('./store');
 const credentialAdapter = require('../../credential-adapter');
 
@@ -33,6 +33,22 @@ function normalizeMcpConfig(mcp, mcpAppIds, nativeMcps) {
   };
 }
 
+function normalizeToolConfig(tools, legacyMcp) {
+  const raw = tools && typeof tools === 'object' && !Array.isArray(tools) ? tools : null;
+  const selectedToolIds = normalizeStringList(
+    raw?.selectedToolIds
+    ?? raw?.selected
+    ?? [
+      ...normalizeStringList(legacyMcp?.appIds),
+      ...normalizeStringList(legacyMcp?.nativeMcps),
+    ],
+  );
+  return {
+    mode: raw?.mode === 'selected' || (!raw && legacyMcp?.inheritAll === false) ? 'selected' : 'all',
+    selectedToolIds,
+  };
+}
+
 async function handleList(sendJson) {
   sendJson(200, { agents: getAllAgentsWithBuiltins() });
 }
@@ -56,34 +72,36 @@ async function handleCreate(body, sendJson) {
     mcpAppIds,
     nativeMcps,
     mcp,
+    tools,
     authMethod,
   } = body;
   if (!name || !name.trim()) return sendJson(400, { error: 'name is required' });
   if (!baseHarnessId) return sendJson(400, { error: 'baseHarnessId is required' });
 
-  const data = loadAgents();
-  if (data.agents.some((a) => a.name.toLowerCase() === name.trim().toLowerCase())) {
-    return sendJson(400, { error: `An agent named "${name.trim()}" already exists` });
+  const mcpConfig = normalizeMcpConfig(mcp, mcpAppIds, nativeMcps);
+  const toolConfig = normalizeToolConfig(tools, mcpConfig);
+  let agent;
+  try {
+    agent = createAgent({
+      name: name.trim(),
+      description: description || '',
+      baseHarnessId,
+      baseModelId: baseModelId || '',
+      systemPrompt: systemPrompt || '',
+      files: normalizeStringList(files),
+      skills: normalizeStringList(skills),
+      mcpAppIds: normalizeStringList(mcpConfig.appIds),
+      nativeMcps: normalizeStringList(mcpConfig.nativeMcps),
+      tools: toolConfig,
+      mcp: {
+        ...mcpConfig,
+        inheritAll: toolConfig.mode !== 'selected',
+      },
+      authMethod: coerceAuthMethodForHarness(baseHarnessId, authMethod),
+    });
+  } catch (error) {
+    return sendJson(400, { error: error.message || 'Failed to create agent' });
   }
-
-  const agent = {
-    id: `custom-${crypto.randomUUID()}`,
-    name: name.trim(),
-    description: description || '',
-    baseHarnessId,
-    baseModelId: baseModelId || '',
-    systemPrompt: systemPrompt || '',
-    files: normalizeStringList(files),
-    skills: normalizeStringList(skills),
-    mcpAppIds: normalizeStringList(mcpAppIds),
-    nativeMcps: normalizeStringList(nativeMcps),
-    mcp: normalizeMcpConfig(mcp, mcpAppIds, nativeMcps),
-    authMethod: coerceAuthMethodForHarness(baseHarnessId, authMethod),
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-  };
-  data.agents.push(agent);
-  saveAgents(data);
   console.log(`[AmalgmMCP] Created agent: ${agent.id} (${agent.name})`);
   sendJson(200, { ok: true, agent });
 }
@@ -91,61 +109,20 @@ async function handleCreate(body, sendJson) {
 async function handleUpdate(body, sendJson) {
   const { agent_id, ...updates } = body;
   if (!agent_id) return sendJson(400, { error: 'agent_id is required' });
-  const data = loadAgents();
-  const agent = data.agents.find((a) => a.id === agent_id);
-  if (!agent) return sendJson(404, { error: `Agent not found: ${agent_id}` });
+  const existing = resolveAgent(agent_id);
+  if (!existing) return sendJson(404, { error: `Agent not found: ${agent_id}` });
 
-  if (
-    updates.name &&
-    data.agents.some(
-      (a) => a.id !== agent_id && a.name.toLowerCase() === updates.name.trim().toLowerCase(),
-    )
-  ) {
-    return sendJson(400, { error: `An agent named "${updates.name.trim()}" already exists` });
+  if (updates.authMethod !== undefined) {
+    updates.authMethod = coerceAuthMethodForHarness(existing.baseHarnessId, updates.authMethod);
   }
 
-  const allowedFields = [
-    'name',
-    'description',
-    'baseHarnessId',
-    'baseModelId',
-    'systemPrompt',
-    'files',
-    'skills',
-    'mcpAppIds',
-    'nativeMcps',
-    'mcp',
-    'authMethod',
-  ];
-  for (const field of allowedFields) {
-    if (updates[field] === undefined) continue;
-
-    if (field === 'files' || field === 'skills' || field === 'mcpAppIds' || field === 'nativeMcps') {
-      agent[field] = normalizeStringList(updates[field]);
-      continue;
-    }
-
-    if (field === 'mcp') {
-      agent.mcp = normalizeMcpConfig(
-        updates.mcp,
-        updates.mcpAppIds ?? agent.mcpAppIds,
-        updates.nativeMcps ?? agent.nativeMcps,
-      );
-      continue;
-    }
-
-    if (field === 'authMethod') {
-      agent.authMethod = coerceAuthMethodForHarness(agent.baseHarnessId, updates.authMethod);
-      continue;
-    }
-
-    agent[field] = updates[field];
+  let agent;
+  try {
+    agent = updateAgent(agent_id, updates);
+  } catch (error) {
+    const message = error.message || 'Failed to update agent';
+    return sendJson(message.includes('not found') ? 404 : 400, { error: message });
   }
-  agent.authMethod = coerceAuthMethodForHarness(agent.baseHarnessId, agent.authMethod);
-  agent.mcpAppIds = normalizeStringList(agent.mcp?.appIds ?? agent.mcpAppIds);
-  agent.nativeMcps = normalizeStringList(agent.mcp?.nativeMcps ?? agent.nativeMcps);
-  agent.updatedAt = new Date().toISOString();
-  saveAgents(data);
   console.log(`[AmalgmMCP] Updated agent: ${agent.id} (${agent.name})`);
   sendJson(200, { ok: true, agent });
 }
@@ -153,11 +130,13 @@ async function handleUpdate(body, sendJson) {
 async function handleDelete(body, sendJson) {
   const { agent_id } = body;
   if (!agent_id) return sendJson(400, { error: 'agent_id is required' });
-  const data = loadAgents();
-  const idx = data.agents.findIndex((a) => a.id === agent_id);
-  if (idx === -1) return sendJson(404, { error: `Agent not found: ${agent_id}` });
-  const deleted = data.agents.splice(idx, 1)[0];
-  saveAgents(data);
+  let deleted;
+  try {
+    deleted = deleteAgent(agent_id);
+  } catch (error) {
+    const message = error.message || 'Failed to delete agent';
+    return sendJson(message.includes('not found') ? 404 : 400, { error: message });
+  }
   console.log(`[AmalgmMCP] Deleted agent: ${agent_id} (${deleted.name})`);
   sendJson(200, { ok: true, deleted });
 }