amalgm 0.1.58 → 0.1.59

package/package.json

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

package/runtime/scripts/amalgm-mcp/lib/prefs.js

@@ -5,9 +5,13 @@
  * for task/event/agent runs without requiring the caller to specify it.
  */
 
+const fs = require('fs');
 const { openLocalDb } = require('../state/db');
 const { insertStateEvent, publishStateEvent } = require('../state/events');
-const { canonicalProjectPath } = require('../../lib/project-paths');
+const {
+  canonicalProjectPath,
+  isWorkspaceRootPath,
+} = require('../../lib/project-paths');
 
 const DEFAULT_SELECTED_MODELS = {
   claude_code: 'anthropic/claude-opus-4.7',
@@ -351,6 +355,26 @@ function reasoningEffortForSelection(harnessId, modelId, normalizedEffort) {
   return normalizeReasoningEffort(settings.effort || settings.reasoningEffort || settings.reasoning) || 'xhigh';
 }
 
+function preferredWorkspaceCwd() {
+  try {
+    const { listWorkspaces } = require('../workspace/store');
+    const workspaces = listWorkspaces()
+      .filter((workspace) => workspace?.path && fs.existsSync(workspace.path));
+    const ready = workspaces.find((workspace) => workspace.status === 'ready');
+    return ready?.path || workspaces[0]?.path || '';
+  } catch {
+    return '';
+  }
+}
+
+function normalizePreferenceCwd(value) {
+  const localPath = canonicalProjectPath(cleanString(value));
+  if (!localPath) return '';
+  if (isWorkspaceRootPath(localPath)) return preferredWorkspaceCwd() || '';
+  if (fs.existsSync(localPath)) return localPath;
+  return preferredWorkspaceCwd() || '';
+}
+
 function normalizePreferences(input) {
   const raw = isPlainObject(input) ? input : {};
   const rawRecentPrefs = isPlainObject(raw.recent_prefs) ? raw.recent_prefs : {};
@@ -383,7 +407,7 @@ function normalizePreferences(input) {
     last_used: {
       harness: lastUsedHarness,
       model: lastUsedModel,
-      cwd: canonicalProjectPath(cleanString(rawLastUsed.cwd ?? raw.last_cwd ?? raw.selected_cwd)),
+      cwd: normalizePreferenceCwd(rawLastUsed.cwd ?? raw.last_cwd ?? raw.selected_cwd),
     },
     usage,
     recent_prefs: recentPrefs,

package/runtime/scripts/lib/project-paths.js

@@ -32,6 +32,21 @@ function legacyWorkspaceRoots() {
     .map((entry) => path.resolve(expandHome(entry)));
 }
 
+function workspaceRootPaths() {
+  const home = process.env.AMALGM_HOME || path.join(os.homedir(), '.amalgm');
+  const stateRoot = process.env.AMALGM_DIR;
+  return [
+    process.env.AMALGM_WORKSPACES_DIR,
+    process.env.AMALGM_PROJECTS_DIR,
+    stateRoot && path.join(stateRoot, 'workspaces'),
+    stateRoot && path.join(stateRoot, 'projects'),
+    path.join(home, 'workspaces'),
+    path.join(home, 'projects'),
+  ]
+    .filter(Boolean)
+    .map((entry) => path.resolve(expandHome(entry)));
+}
+
 function legacyManagedRelativePath(localPath) {
   const resolved = path.resolve(expandHome(localPath));
   const currentRoot = cleanString(process.env.AMALGM_WORKSPACES_DIR || process.env.AMALGM_PROJECTS_DIR);
@@ -64,9 +79,17 @@ function isLegacyManagedWorkspacePath(value) {
   return Boolean(cleanString(value) && legacyManagedRelativePath(value));
 }
 
+function isWorkspaceRootPath(value) {
+  const expanded = expandHome(value);
+  if (!expanded) return false;
+  const resolved = path.resolve(expanded);
+  return workspaceRootPaths().some((root) => path.resolve(root) === resolved);
+}
+
 module.exports = {
   canonicalProjectPath,
   cleanString,
   expandHome,
   isLegacyManagedWorkspacePath,
+  isWorkspaceRootPath,
 };