amalgm 0.1.143 → 0.1.144

package/package.json

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

package/runtime/lib/local/amalgmStore.js

@@ -48,8 +48,6 @@ var DIRECTORIES = [
   // ~/.amalgm/
   "browser",
   // ~/.amalgm/browser/
-  "browser/local-storage",
-  // ~/.amalgm/browser/local-storage/
   "agents",
   // ~/.amalgm/agents/
   "instructions",
@@ -70,11 +68,6 @@ var DEFAULT_FILES = {
     version: 1,
     createdAt: (/* @__PURE__ */ new Date()).toISOString()
   },
-  "browser/cookies.json": {
-    version: 1,
-    updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    cookies: []
-  },
   "agents/discovery.json": {
     version: 1,
     lastScan: null,

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

@@ -2,7 +2,7 @@
  * /apps/* REST routes for the Next.js API and local tunnel runtime.
  */
 
-const { getConnectedRoutes, loadApps } = require('./store');
+const { getApp, getConnectedRoutes, loadApps, updateAppMeta } = require('./store');
 const {
   deleteApp,
   connectDns,
@@ -109,6 +109,28 @@ async function handleDelete(body, sendJson, options = {}) {
   }
 }
 
+async function handleUpdate(body, sendJson, options = {}) {
+  try {
+    const appId = appIdFromBody(body);
+    if (!appId) return sendJson(400, { error: 'app_id is required' });
+    if (!getApp(appId)) return sendJson(404, { error: 'App not found' });
+
+    const updates = {};
+    if (typeof body?.name === 'string' && body.name.trim()) updates.name = body.name.trim();
+    if (typeof body?.description === 'string') updates.description = body.description;
+    const toolIds = body?.tool_ids ?? body?.toolIds;
+    if (Array.isArray(toolIds)) updates.toolIds = toolIds;
+    if (Object.keys(updates).length === 0) {
+      return sendJson(400, { error: 'No updatable fields provided (name, description, tool_ids)' });
+    }
+
+    const app = updateAppMeta(appId, updates);
+    sendJson(200, appPayload(app, options));
+  } catch (err) {
+    sendJson(400, { error: err instanceof Error ? err.message : String(err) });
+  }
+}
+
 async function handleConnectDns(body, sendJson, options = {}) {
   try {
     const appId = appIdFromBody(body);
@@ -141,4 +163,5 @@ module.exports = {
   handleRoutes,
   handleStart,
   handleStop,
+  handleUpdate,
 };

package/runtime/scripts/amalgm-mcp/apps/supervisor.js

@@ -390,10 +390,26 @@ async function deleteApp(appId) {
   stopping.delete(appId);
   running.delete(appId);
   await syncRoutesBestEffort(`delete:${appId}`);
+  clearAppLinkFromTools(appId);
 
   return app;
 }
 
+// Keep the app↔tool relation from drifting: tools pointing at a deleted app
+// must lose their appId, or sharing them would chase a dead dependency.
+function clearAppLinkFromTools(appId) {
+  try {
+    const { readToolbox, updateTool } = require('../toolbox/store');
+    const owned = Object.values(readToolbox().tools)
+      .filter((tool) => tool.appId === appId && tool.origin !== 'system');
+    for (const tool of owned) {
+      updateTool({ id: tool.id, appId: null });
+    }
+  } catch (error) {
+    console.warn('[Apps] Failed to clear app link from tools:', error.message);
+  }
+}
+
 async function registerApp(input) {
   const name = String(input.name || '').trim() || 'App';
   const cwd = path.resolve(input.cwd || input.root_dir || DEFAULT_CWD);

package/runtime/scripts/amalgm-mcp/browser/cli.js

@@ -21,6 +21,7 @@ const os = require('os');
 const path = require('path');
 const { spawn } = require('child_process');
 const { amalgmDir: resolveAmalgmDir } = require('../../lib/runtime-paths');
+const { safeId } = require('./paths');
 
 const DEFAULT_TIMEOUT_MS = 120_000;
 const DEFAULT_SESSION = 'default';
@@ -35,11 +36,6 @@ function ensureDir(dir) {
   return dir;
 }
 
-function safeId(value, fallback = DEFAULT_SESSION) {
-  const raw = String(value || fallback).replace(/^agent-browser:/, '');
-  return raw.replace(/[^a-zA-Z0-9._-]/g, '_').slice(0, 64) || fallback;
-}
-
 function browserRoot() {
   return ensureDir(path.join(amalgmDir(), 'browser'));
 }

package/runtime/scripts/amalgm-mcp/browser/engine.js

@@ -79,13 +79,28 @@ async function loadStateIntoSession(session, statePayload, context) {
 
 async function ensureCookieSourceLoaded(session, context) {
   if (cookieSourceDisabled()) return;
+  // Attached sessions drive the desktop app's own jar — the jar the cookie
+  // source is exported FROM (electron/browserCookieSource.ts). Importing the
+  // bundle back into it is at best an echo and at worst overwrites the user's
+  // live cookies with older ones. Only headless sessions import.
+  if (sessions.backendFor(session) === 'attached') return;
   const bundle = getBrowserAuthBundle(COOKIE_SOURCE_BUNDLE_ID);
   if (!bundle?.blobPath) return;
   const version = cookieSourceVersion(bundle);
   if (version && loadedCookieSources.get(session) === version) return;
-  const { payload } = readEncryptedStateBundle(COOKIE_SOURCE_BUNDLE_ID);
-  if (!payload?.state || typeof payload.state !== 'object') return;
-  await loadStateIntoSession(session, payload.state, context);
+  try {
+    const { payload } = readEncryptedStateBundle(COOKIE_SOURCE_BUNDLE_ID);
+    if (payload?.state && typeof payload.state === 'object') {
+      await loadStateIntoSession(session, payload.state, context);
+      console.error(`[browser] cookie source ${String(version).slice(0, 12)} imported into session ${session}`);
+    }
+  } catch (err) {
+    // A bad bundle (key mismatch, corrupt blob, load failure) must degrade to
+    // a logged-out session, never break every browser verb.
+    console.error(`[browser] cookie source import failed for session ${session}: ${err.message}`);
+  }
+  // Recorded even on failure: the failure is a property of this bundle
+  // version, so retrying on every verb would only repeat the error.
   if (version) loadedCookieSources.set(session, version);
 }
 

package/runtime/scripts/amalgm-mcp/browser/paths.js

@@ -10,9 +10,14 @@ function ensurePrivateDir(dir) {
   return dir;
 }
 
+// The one id sanitizer for the browser module — cli.js re-exports it. The
+// 64-char cap matches the profile directories cli.js actually creates;
+// history note: cli.js and this file once disagreed (64 vs 96), which would
+// have put the chromium profile and its registry record at different paths
+// for long ids.
 function safeId(value, fallback = 'default') {
   const raw = String(value || fallback).replace(/^agent-browser:/, '');
-  return raw.replace(/[^a-zA-Z0-9._-]/g, '_').slice(0, 96) || fallback;
+  return raw.replace(/[^a-zA-Z0-9._-]/g, '_').slice(0, 64) || fallback;
 }
 
 function browserRoot() {

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

@@ -53,11 +53,18 @@ function handleAuthBundlesList(sendJson) {
 
 async function exportAuthBundleFromProfile(body = {}) {
   const profileId = profileIdFrom(body);
-  const saved = await saveStateBrowser({
-    ...body,
-    browserProfileId: profileId,
-    browserSessionId: profileId,
-  }, {});
+  // A caller that already holds the jar (the desktop app pushing its Electron
+  // session, see electron/browserCookieSource.ts) sends `state` directly.
+  // Capturing via a browser session here would read whichever backend the
+  // in-process session registry happens to name — after a runtime restart
+  // that is an empty headless profile, not the jar the user logged into.
+  const saved = body.state && typeof body.state === 'object'
+    ? { state: body.state, backend: 'state-push' }
+    : await saveStateBrowser({
+      ...body,
+      browserProfileId: profileId,
+      browserSessionId: profileId,
+    }, {});
 
   const bundle = writeEncryptedStateBundle({
     id: body.id || (profileId === DEFAULT_COOKIE_SOURCE_PROFILE_ID ? COOKIE_SOURCE_BUNDLE_ID : undefined),