@wipcomputer/wip-ldm-os 0.4.62 → 0.4.64

package/SKILL.md

@@ -9,7 +9,7 @@ license: MIT
 compatibility: Requires git, npm, node. Node.js 18+.
 metadata:
   display-name: "LDM OS"
-  version: "0.4.62"
+  version: "0.4.64"
   homepage: "https://github.com/wipcomputer/wip-ldm-os"
   author: "Parker Todd Brooks"
   category: infrastructure

package/bin/ldm.js

@@ -226,6 +226,22 @@ function cleanDeadBackupTriggers() {
     cleaned++;
   }
 
+  // 3. Unload and disable com.wipcomputer.cc-watcher LaunchAgent
+  // Broken since Mar 24 migration (old iCloud path, wrong node path).
+  // The agent communication channel needs redesign, not screen automation.
+  const ccWatcherPlist = join(HOME, 'Library', 'LaunchAgents', 'com.wipcomputer.cc-watcher.plist');
+  const ccWatcherDisabled = ccWatcherPlist + '.disabled';
+  if (existsSync(ccWatcherPlist)) {
+    try { execSync(`launchctl unload "${ccWatcherPlist}" 2>/dev/null`, { stdio: 'pipe' }); } catch {}
+    try {
+      renameSync(ccWatcherPlist, ccWatcherDisabled);
+    } catch {
+      try { unlinkSync(ccWatcherPlist); } catch {}
+    }
+    console.log('  + Disabled dead LaunchAgent: com.wipcomputer.cc-watcher');
+    cleaned++;
+  }
+
   return cleaned;
 }
 
@@ -375,6 +391,86 @@ async function installCatalogComponent(c) {
   console.log(`  ✓ Installed ${c.name}`);
 }
 
+// ── Bridge deploy (#245) ──
+// The bridge (src/bridge/) builds to dist/bridge/ and ships in the npm package.
+// After `npm install -g`, the updated files live at the npm package location but
+// never get copied to ~/.ldm/extensions/lesa-bridge/dist/. This function fixes that.
+
+function deployBridge() {
+  const bridgeDest = join(LDM_EXTENSIONS, 'lesa-bridge', 'dist');
+
+  // Only deploy if the extension is installed
+  if (!existsSync(join(LDM_EXTENSIONS, 'lesa-bridge'))) return 0;
+
+  // Find the npm package bridge files. Try require.resolve first, fall back to known path.
+  let bridgeSrc = '';
+  try {
+    const pkgJson = join(__dirname, '..', 'dist', 'bridge');
+    if (existsSync(pkgJson)) {
+      bridgeSrc = pkgJson;
+    }
+  } catch {}
+
+  if (!bridgeSrc) {
+    // Fallback: check common global npm locations
+    const candidates = [
+      '/opt/homebrew/lib/node_modules/@wipcomputer/wip-ldm-os/dist/bridge',
+      join(HOME, '.npm-global/lib/node_modules/@wipcomputer/wip-ldm-os/dist/bridge'),
+    ];
+    for (const c of candidates) {
+      if (existsSync(c)) {
+        bridgeSrc = c;
+        break;
+      }
+    }
+  }
+
+  if (!bridgeSrc || !existsSync(bridgeSrc)) return 0;
+
+  // Check if files differ before copying
+  let changed = false;
+  try {
+    const srcFiles = readdirSync(bridgeSrc).filter(f => f.endsWith('.js') || f.endsWith('.d.ts'));
+    for (const file of srcFiles) {
+      const srcPath = join(bridgeSrc, file);
+      const destPath = join(bridgeDest, file);
+      if (!existsSync(destPath)) {
+        changed = true;
+        break;
+      }
+      const srcContent = readFileSync(srcPath);
+      const destContent = readFileSync(destPath);
+      if (!srcContent.equals(destContent)) {
+        changed = true;
+        break;
+      }
+    }
+  } catch {
+    changed = true; // if comparison fails, copy anyway
+  }
+
+  if (!changed) return 0;
+
+  if (DRY_RUN) {
+    console.log(`  + would deploy bridge files to ~/.ldm/extensions/lesa-bridge/dist/`);
+    return 0;
+  }
+
+  try {
+    mkdirSync(bridgeDest, { recursive: true });
+    const files = readdirSync(bridgeSrc).filter(f => f.endsWith('.js') || f.endsWith('.d.ts'));
+    for (const file of files) {
+      cpSync(join(bridgeSrc, file), join(bridgeDest, file));
+    }
+    console.log(`  + bridge deployed to ~/.ldm/extensions/lesa-bridge/dist/ (${files.length} files)`);
+    installLog(`Bridge deployed: ${files.length} files to ~/.ldm/extensions/lesa-bridge/dist/`);
+    return files.length;
+  } catch (e) {
+    console.log(`  ! bridge deploy failed: ${e.message}`);
+    return 0;
+  }
+}
+
 // ── ldm init ──
 
 async function cmdInit() {
@@ -396,6 +492,32 @@ async function cmdInit() {
     join(LDM_ROOT, 'hooks'),
   ];
 
+  // Migrate config-from-home.json into config.json (one-time merge)
+  // config-from-home.json held org identity (coAuthors, paths, agents, backup, etc.)
+  // config.json held runtime/harness info. Now they are one file.
+  const configFromHomePath = join(LDM_ROOT, 'config-from-home.json');
+  if (existsSync(configFromHomePath) && existsSync(join(LDM_ROOT, 'config.json'))) {
+    try {
+      const existing = JSON.parse(readFileSync(join(LDM_ROOT, 'config.json'), 'utf8'));
+      const fromHome = JSON.parse(readFileSync(configFromHomePath, 'utf8'));
+      // Merge: config-from-home.json wins where keys overlap (richer data)
+      const merged = { ...existing, ...fromHome };
+      // Preserve harnesses from existing config (not in config-from-home.json)
+      if (existing.harnesses) merged.harnesses = existing.harnesses;
+      // Preserve version and created from existing config
+      if (existing.version) merged.version = existing.version;
+      if (existing.created) merged.created = existing.created;
+      // Update timestamp
+      merged.updatedAt = new Date().toISOString();
+      writeFileSync(join(LDM_ROOT, 'config.json'), JSON.stringify(merged, null, 2) + '\n');
+      renameSync(configFromHomePath, configFromHomePath + '.migrated');
+      console.log(`  + config-from-home.json merged into config.json`);
+      console.log(`  + config-from-home.json renamed to config-from-home.json.migrated`);
+    } catch (e) {
+      console.log(`  ! config-from-home.json migration failed: ${e.message}`);
+    }
+  }
+
   // Scaffold per-agent memory dirs
   try {
     const config = JSON.parse(readFileSync(join(LDM_ROOT, 'config.json'), 'utf8'));
@@ -674,10 +796,9 @@ async function cmdInit() {
         mkdirSync(docsDest, { recursive: true });
         let docsCount = 0;
 
-        // Build template values from BOTH configs:
-        // ~/.ldm/config.json (harnesses, workspace) + settings/config.json (agents, paths, org)
-        const settingsConfig = JSON.parse(readFileSync(join(workspacePath, 'settings', 'config.json'), 'utf8'));
-        const sc = settingsConfig;
+        // Build template values from ~/.ldm/config.json (unified config)
+        // Legacy: settings/config.json was a separate file, now merged into config.json
+        const sc = ldmConfig;
         const lc = ldmConfig;
 
         // Agents from settings config (rich objects with harness/machine/prefix)
@@ -771,6 +892,9 @@ async function cmdInit() {
     }
   }
 
+  // Deploy bridge files to ~/.ldm/extensions/lesa-bridge/dist/ (#245)
+  deployBridge();
+
   // Clean up dead backup triggers (#207)
   // Bug: three backup systems were competing. Only ai.openclaw.ldm-backup (3am) works.
   // The old cron entry (LDMDevTools.app) and com.wipcomputer.daily-backup are dead.
@@ -1142,6 +1266,11 @@ async function cmdInstallCatalog() {
 
   autoDetectExtensions();
 
+  // Deploy bridge files after self-update or on every catalog install (#245)
+  // After npm install -g, the new bridge files are in the npm package but not
+  // in ~/.ldm/extensions/lesa-bridge/dist/. This copies them.
+  deployBridge();
+
   const { detectSystemState, reconcileState, formatReconciliation } = await import('../lib/state.mjs');
   const state = detectSystemState();
   const reconciled = reconcileState(state);
@@ -1384,6 +1513,9 @@ async function cmdInstallCatalog() {
       return matches.includes(name) || c.id === name;
     });
 
+    // Skip pinned components (e.g. OpenClaw). Upgrades must be explicit.
+    if (catalogEntry?.pinned) continue;
+
     // Fallback: use repository.url from extension's package.json (#82)
     let repoUrl = catalogEntry?.repo || null;
     if (!repoUrl && extPkg?.repository) {

package/catalog.json

@@ -255,6 +255,8 @@
       ],
       "recommended": false,
       "status": "stable",
+      "pinned": true,
+      "pinnedReason": "OpenClaw is the runtime. Upgrades overwrite dist patches and can change API behavior. Use: ldm upgrade openclaw",
       "postInstall": null,
       "installs": {
         "cli": [

package/dist/bridge/{chunk-I5FNBIR2.js → chunk-QZ4DNVJM.js}

@@ -106,7 +106,7 @@ async function sendMessage(openclawDir, message, options) {
       "Content-Type": "application/json"
     },
     body: JSON.stringify({
-      model: agentId,
+      model: `openclaw/${agentId}`,
       user: "main",
       messages: [
         {

package/dist/bridge/cli.js

@@ -8,7 +8,7 @@ import {
   searchConversations,
   searchWorkspace,
   sendMessage
-} from "./chunk-I5FNBIR2.js";
+} from "./chunk-QZ4DNVJM.js";
 
 // cli.ts
 import { existsSync, statSync } from "fs";

package/dist/bridge/core.js

@@ -17,7 +17,7 @@ import {
   searchConversations,
   searchWorkspace,
   sendMessage
-} from "./chunk-I5FNBIR2.js";
+} from "./chunk-QZ4DNVJM.js";
 export {
   LDM_ROOT,
   blobToEmbedding,

package/dist/bridge/mcp-server.js

@@ -9,7 +9,7 @@ import {
   searchConversations,
   searchWorkspace,
   sendMessage
-} from "./chunk-I5FNBIR2.js";
+} from "./chunk-QZ4DNVJM.js";
 
 // mcp-server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wipcomputer/wip-ldm-os",
-  "version": "0.4.62",
+  "version": "0.4.64",
   "type": "module",
   "description": "LDM OS: identity, memory, and sovereignty infrastructure for AI agents",
   "engines": {

package/scripts/ldm-backup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # ldm-backup.sh — Unified backup for LDM OS
-# Backs up: ~/.ldm/, ~/.openclaw/, ~/.claude/, ~/wipcomputerinc/
+# Backs up: ~/.ldm/, ~/.openclaw/, ~/.claude/, $WORKSPACE/
 # Handles SQLite safely (sqlite3 .backup). Tars to iCloud for offsite.
 #
 # Source of truth: wip-ldm-os-private/scripts/ldm-backup.sh
@@ -12,7 +12,7 @@
 #   ldm-backup.sh --keep 14           # keep last 14 backups (default: 7)
 #   ldm-backup.sh --include-secrets   # include ~/.ldm/secrets/
 #
-# Config: ~/.ldm/config.json (workspace path) + {workspace}/settings/config.json (backup settings)
+# Config: ~/.ldm/config.json (workspace path, backup settings, iCloud path)
 
 set -euo pipefail
 
@@ -45,20 +45,29 @@ if [ -z "$WORKSPACE" ]; then
   echo "WARNING: No workspace in ~/.ldm/config.json. Skipping workspace backup."
 fi
 
-# Read iCloud backup path from workspace config
+# Read org name from config (used for tar filename)
+ORG=""
+if [ -f "$LDM_HOME/config.json" ]; then
+  ORG=$(python3 -c "import json; print(json.load(open('$LDM_HOME/config.json')).get('org',''))" 2>/dev/null || true)
+fi
+if [ -z "$ORG" ]; then
+  ORG="workspace"
+fi
+
+# Read iCloud backup path from ~/.ldm/config.json
 ICLOUD_BACKUP=""
-if [ -n "$WORKSPACE" ] && [ -f "$WORKSPACE/settings/config.json" ]; then
+if [ -f "$LDM_HOME/config.json" ]; then
   ICLOUD_BACKUP=$(python3 -c "
 import json, os
-c = json.load(open('$WORKSPACE/settings/config.json'))
+c = json.load(open('$LDM_HOME/config.json'))
 p = c.get('paths',{}).get('icloudBackup','')
 print(os.path.expanduser(p))
 " 2>/dev/null || true)
 fi
 
-# Read keep from workspace config (override if set there)
-if [ -n "$WORKSPACE" ] && [ -f "$WORKSPACE/settings/config.json" ]; then
-  CONFIG_KEEP=$(python3 -c "import json; print(json.load(open('$WORKSPACE/settings/config.json')).get('backup',{}).get('keep',0))" 2>/dev/null || true)
+# Read keep from ~/.ldm/config.json (override if set there)
+if [ -f "$LDM_HOME/config.json" ]; then
+  CONFIG_KEEP=$(python3 -c "import json; print(json.load(open('$LDM_HOME/config.json')).get('backup',{}).get('keep',0))" 2>/dev/null || true)
   if [ -n "$CONFIG_KEEP" ] && [ "$CONFIG_KEEP" -gt 0 ] 2>/dev/null; then
     KEEP="$CONFIG_KEEP"
   fi
@@ -211,7 +220,7 @@ if [ -n "$WORKSPACE" ] && [ -d "$WORKSPACE" ]; then
     echo "  ERROR: Workspace estimated at ${ESTIMATED_KB}KB (>10GB). Aborting tar to prevent disk fill."
     echo "  Check for large directories: du -sh $WORKSPACE/*/"
   else
-    tar -cf "$DEST/wipcomputerinc.tar" \
+    tar -cf "$DEST/$ORG.tar" \
       --exclude "node_modules" \
       --exclude ".git/objects" \
       --exclude ".DS_Store" \

package/src/bridge/core.ts

@@ -198,7 +198,7 @@ export async function sendMessage(
       "Content-Type": "application/json",
     },
     body: JSON.stringify({
-      model: agentId,
+      model: `openclaw/${agentId}`,
       user: "main",
       messages: [
         {