amalgm 0.1.154 → 0.1.155

package/package.json

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

package/runtime/scripts/amalgm-mcp/agent-bundles/bundles.js

@@ -3,14 +3,13 @@
 // Facade over the agent-bundle modules so existing require paths keep working.
 // The implementation lives in graph.js (flat share graph), export.js
 // (createBundle and its collectors), and install.js (validate + install).
-const { BUNDLE_KIND, BUNDLE_SCHEMA_VERSION, LEGACY_AGENT_BUNDLE_KIND } = require('./graph');
+const { BUNDLE_KIND, BUNDLE_SCHEMA_VERSION } = require('./graph');
 const { createAgentBundle, createBundle } = require('./export');
 const { installBundle, validateBundle } = require('./install');
 
 module.exports = {
   BUNDLE_KIND,
   BUNDLE_SCHEMA_VERSION,
-  LEGACY_AGENT_BUNDLE_KIND,
   createAgentBundle,
   createBundle,
   installBundle,

package/runtime/scripts/amalgm-mcp/agent-bundles/export.js

@@ -14,7 +14,6 @@ const { annotateAppBoundPaths } = require('./tool-bindings');
 const {
   BUNDLE_KIND,
   BUNDLE_SCHEMA_VERSION,
-  LEGACY_AGENT_BUNDLE_KIND,
   addUnique,
   cloneJson,
   collectSkillRecords,
@@ -85,10 +84,7 @@ function collectToolRecords(toolIds, requires) {
     const selectedAction = catalog.toolActions?.[selectedId];
     const tool = selectedTool || (selectedAction ? catalog.tools?.[selectedAction.toolId] : null);
 
-    if (!tool) {
-      addUnique(requires.missingTools, selectedId);
-      continue;
-    }
+    if (!tool) throw new Error(`Tool not found: ${selectedId}`);
 
     if (tool.origin === 'system') {
       addUnique(requires.systemTools, tool.id);
@@ -217,31 +213,46 @@ function createBundle(input = {}, options = {}) {
     for (const ref of exported.missingRefs) addUnique(requires.missingTools, ref);
   }
 
-  // Tool → app closure: an app-owned tool only works next to its app, so any
-  // requested tool whose record points at an app pulls that app in as a
-  // dependency (not a head). Stale pointers degrade to a warning.
-  const appLinkWarnings = [];
-  const dependencyAppIds = [];
+  // Close the tool↔app graph from the two canonical declarations: tool.appId
+  // and the app manifest's toolIds. Pack each discovered app once, and keep
+  // walking until neither side discovers another record.
   const catalog = defaultToolboxService.readCatalog();
-  for (const selectedId of uniqueStrings([...loadoutToolIds, ...toolIds])) {
-    const selectedAction = catalog.toolActions?.[selectedId];
-    const tool = catalog.tools?.[selectedId]
-      || (selectedAction ? catalog.tools?.[selectedAction.toolId] : null);
-    const owningAppId = typeof tool?.appId === 'string' ? tool.appId.trim() : '';
-    if (!owningAppId || appIds.includes(owningAppId) || dependencyAppIds.includes(owningAppId)) continue;
-    if (!getApp(owningAppId)) {
-      appLinkWarnings.push(`Tool ${tool.id} belongs to app ${owningAppId}, which no longer exists; the app was not bundled.`);
-      continue;
+  const closedToolRefs = uniqueStrings([...loadoutToolIds, ...toolIds]);
+  const closedAppIds = [...appIds];
+  const exportedAppsById = new Map();
+  let toolCursor = 0;
+  let appCursor = 0;
+  while (toolCursor < closedToolRefs.length || appCursor < closedAppIds.length) {
+    if (toolCursor < closedToolRefs.length) {
+      const selectedId = closedToolRefs[toolCursor];
+      toolCursor += 1;
+      const selectedAction = catalog.toolActions?.[selectedId];
+      const tool = catalog.tools?.[selectedId]
+        || (selectedAction ? catalog.tools?.[selectedAction.toolId] : null);
+      if (!tool) throw new Error(`Tool not found: ${selectedId}`);
+      const owningAppId = typeof tool.appId === 'string' ? tool.appId.trim() : '';
+      if (owningAppId && !closedAppIds.includes(owningAppId)) {
+        if (!getApp(owningAppId)) throw new Error(`Tool ${tool.id} references missing app: ${owningAppId}`);
+        closedAppIds.push(owningAppId);
+      }
+    }
+    if (appCursor < closedAppIds.length) {
+      const appId = closedAppIds[appCursor];
+      appCursor += 1;
+      const exported = exportAppEntry(appId);
+      exportedAppsById.set(appId, exported);
+      for (const appToolId of uniqueStrings(exported.entry.toolIds)) {
+        if (!closedToolRefs.includes(appToolId)) closedToolRefs.push(appToolId);
+      }
     }
-    dependencyAppIds.push(owningAppId);
   }
 
   const apps = [];
   const appCwdBySourceId = new Map();
   let excludedAppFiles = 0;
   const appToolIds = [];
-  for (const appId of [...appIds, ...dependencyAppIds]) {
-    const exported = exportAppEntry(appId);
+  for (const appId of closedAppIds) {
+    const exported = exportedAppsById.get(appId);
     apps.push(exported.entry);
     appCwdBySourceId.set(exported.entry.sourceAppId, exported.sourceCwd);
     excludedAppFiles += exported.skipped.length;
@@ -249,7 +260,10 @@ function createBundle(input = {}, options = {}) {
     appToolIds.push(...(exported.entry.toolIds || []));
   }
 
-  const { tools, toolActions } = collectToolRecords([...loadoutToolIds, ...appToolIds, ...toolIds], requires);
+  const { tools, toolActions } = collectToolRecords([...closedToolRefs, ...appToolIds], requires);
+  if (requires.missingTools.length > 0) {
+    throw new Error(`Tool not found: ${requires.missingTools.join(', ')}`);
+  }
 
   // Tool files that live inside a shared app travel with that app: record
   // app-relative bindings so install rewrites them to the recipient's copy.
@@ -260,8 +274,7 @@ function createBundle(input = {}, options = {}) {
     const { unbound } = annotateAppBoundPaths(record, appCwdBySourceId);
     for (const label of unbound) addUnique(requires.bindings, `${kind}:${record.id}:${label}`);
   }
-  // Standalone tool heads must resolve to a real catalog tool — a dependency
-  // tool that is missing degrades to a placeholder, but a head cannot.
+  // Standalone tool heads must resolve to a real catalog tool.
   const sharedToolIds = toolIds.filter((toolId) => tools.some((tool) => tool.id === toolId));
   const missingSharedToolIds = toolIds.filter((toolId) => !sharedToolIds.includes(toolId));
   if (missingSharedToolIds.length > 0) {
@@ -270,16 +283,13 @@ function createBundle(input = {}, options = {}) {
   const sharedTools = sharedToolIds.map((toolId) => tools.find((tool) => tool.id === toolId));
   const skills = collectSkillRecords(agents);
   const hooks = countHooks(agents);
-  const warnings = [
-    ...bundleWarnings({
-      hooks,
-      tools: tools.length,
-      automations: automations.length,
-      apps: apps.length,
-      excludedAppFiles,
-    }),
-    ...appLinkWarnings,
-  ];
+  const warnings = bundleWarnings({
+    hooks,
+    tools: tools.length,
+    automations: automations.length,
+    apps: apps.length,
+    excludedAppFiles,
+  });
   // Title comes from what the user deliberately shared: dependency apps
   // pulled in by an app-owned tool must not name the bundle.
   const headApps = apps.filter((entry) => appIds.includes(entry.sourceAppId));
@@ -292,9 +302,7 @@ function createBundle(input = {}, options = {}) {
   ];
 
   const bundle = withBundleGraph({
-    kind: automations.length > 0 || apps.length > 0 || sharedToolIds.length > 0
-      ? BUNDLE_KIND
-      : LEGACY_AGENT_BUNDLE_KIND,
+    kind: BUNDLE_KIND,
     schemaVersion: BUNDLE_SCHEMA_VERSION,
     bundleId: options.bundleId || bundleId(),
     createdAt: nowIso(),