@magclaw/cli-core 0.1.31 → 0.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magclaw/cli-core",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Shared local MagClaw CLI implementation used by daemon and computer packages.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -1118,6 +1118,10 @@ function defaultCliNpmPath(env = process.env) {
   return commandExists('npm', env) || (process.platform === 'win32' ? 'npm.cmd' : 'npm');
 }
 
+function contentHash(value = '') {
+  return crypto.createHash('sha256').update(String(value || '')).digest('hex');
+}
+
 function cliShimTargets({ packageSpec = '@magclaw/cli-core@latest', computerPackageSpec = '@magclaw/computer@latest' } = {}) {
   return [
     {
@@ -1146,9 +1150,11 @@ export function renderCliShimFiles({
     return targets.flatMap((target) => [
       {
         name: `${target.command}.cmd`,
+        command: target.command,
         executable: true,
         content: [
           '@echo off',
+          `rem MagClaw CLI shim generated by @magclaw/cli-core ${DAEMON_VERSION}.`,
           'setlocal',
           `set "NPM_BIN=${cmdEnvValue(targetNpm)}"`,
           `if not exist "%NPM_BIN%" set "NPM_BIN=${cmdEnvValue(fallback)}"`,
@@ -1161,8 +1167,10 @@ export function renderCliShimFiles({
       },
       {
         name: `${target.command}.ps1`,
+        command: target.command,
         executable: true,
         content: [
+          `# MagClaw CLI shim generated by @magclaw/cli-core ${DAEMON_VERSION}.`,
           `$npmBin = ${psSingleQuote(targetNpm)}`,
           `if (-not (Test-Path -LiteralPath $npmBin)) { $npmBin = ${psSingleQuote(fallback)} }`,
           `$packageSpec = ${psSingleQuote(target.packageSpec)}`,
@@ -1177,11 +1185,12 @@ export function renderCliShimFiles({
   return targets.map((target) => (
     {
       name: target.command,
+      command: target.command,
       executable: true,
       content: [
         '#!/bin/sh',
         'set -eu',
-        '# MagClaw CLI shim generated by @magclaw/cli-core.',
+        `# MagClaw CLI shim generated by @magclaw/cli-core ${DAEMON_VERSION}.`,
         `NPM_BIN=${shSingleQuote(targetNpm)}`,
         `PACKAGE_SPEC=${shSingleQuote(target.packageSpec)}`,
         'if [ ! -x "$NPM_BIN" ]; then',
@@ -1247,17 +1256,64 @@ async function existingDurableMagclawCommand(command = 'magclaw', env = process.
   return existing;
 }
 
+async function inspectCliShimFile(file, expectedContent) {
+  const expectedHash = contentHash(expectedContent);
+  let existing = null;
+  try {
+    existing = await readFile(file, 'utf8');
+  } catch (error) {
+    if (error?.code !== 'ENOENT') throw error;
+  }
+  if (existing === null) {
+    return {
+      file,
+      exists: false,
+      generated: true,
+      upToDate: false,
+      reason: 'missing',
+      currentHash: '',
+      expectedHash,
+    };
+  }
+  const generated = isGeneratedMagClawShim(existing);
+  const currentHash = contentHash(existing);
+  return {
+    file,
+    exists: true,
+    generated,
+    upToDate: generated && currentHash === expectedHash,
+    reason: generated ? (currentHash === expectedHash ? 'current' : 'outdated') : 'non_magclaw_command',
+    currentHash,
+    expectedHash,
+  };
+}
+
 async function writeCliShimFile(file, content, { force = false } = {}) {
-  if (existsSync(file) && !force) {
-    const existing = await readFile(file, 'utf8').catch(() => '');
-    if (!isGeneratedMagClawShim(existing)) {
-      const error = new Error(`Refusing to overwrite existing non-MagClaw command: ${file}`);
-      error.code = 'EEXIST';
-      throw error;
-    }
+  const status = await inspectCliShimFile(file, content);
+  if (status.exists && !status.generated && !force) {
+    const error = new Error(`Refusing to overwrite existing non-MagClaw command: ${file}`);
+    error.code = 'EEXIST';
+    throw error;
+  }
+  if (status.upToDate && !force) {
+    await chmod(file, 0o755).catch(() => {});
+    return {
+      ...status,
+      changed: false,
+      written: false,
+    };
   }
   await writeFile(file, content);
   await chmod(file, 0o755).catch(() => {});
+  return {
+    ...status,
+    changed: true,
+    written: true,
+    upToDate: true,
+    reason: force && status.exists ? 'forced' : status.reason,
+    previousHash: status.currentHash,
+    currentHash: status.expectedHash,
+  };
 }
 
 async function installCliShim(options = {}, env = process.env) {
@@ -1266,24 +1322,6 @@ async function installCliShim(options = {}, env = process.env) {
   }
   const existing = await existingDurableMagclawCommand('magclaw', env);
   const existingComputer = await existingDurableMagclawCommand('magclaw-computer', env);
-  const existingCommandsShareDir = Boolean(
-    existing
-    && existingComputer
-    && path.dirname(existing) === path.dirname(existingComputer)
-  );
-  if (existingCommandsShareDir && !options.binDir && !options.cliBinDir && !options.force) {
-    return {
-      ok: true,
-      command: 'magclaw',
-      commands: ['magclaw', 'magclaw-computer'],
-      installed: false,
-      path: existing,
-      files: [existing, existingComputer],
-      pathReady: true,
-      reason: 'already_available',
-    };
-  }
-
   const target = (existing || existingComputer) && !options.binDir && !options.cliBinDir && !options.force
     ? { dir: path.dirname(existing || existingComputer), explicit: false, pathReady: true }
     : await chooseCliShimBinDir(options, env);
@@ -1297,21 +1335,33 @@ async function installCliShim(options = {}, env = process.env) {
     packageSpec,
     computerPackageSpec,
   });
-  const written = [];
+  const shimResults = [];
   for (const shim of shimFiles) {
     const file = path.join(target.dir, shim.name);
-    await writeCliShimFile(file, shim.content, { force: Boolean(options.force) });
-    written.push(file);
+    const result = await writeCliShimFile(file, shim.content, { force: Boolean(options.force) });
+    shimResults.push({
+      command: shim.command || shim.name,
+      name: shim.name,
+      ...result,
+    });
   }
+  const changedShims = shimResults.filter((shim) => shim.changed);
+  const reason = changedShims.length
+    ? (changedShims.every((shim) => !shim.exists) ? 'installed' : 'updated')
+    : 'already_current';
   return {
     ok: true,
     command: 'magclaw',
     commands: ['magclaw', 'magclaw-computer'],
-    installed: true,
+    installed: changedShims.length > 0,
+    updated: changedShims.length > 0,
     binDir: target.dir,
-    files: written,
-    path: written[0] || '',
+    files: shimResults.map((shim) => shim.file),
+    changedFiles: changedShims.map((shim) => shim.file),
+    shims: shimResults,
+    path: shimResults[0]?.file || '',
     pathReady: Boolean(target.pathReady),
+    reason,
     packageSpec,
     computerPackageSpec,
     npmPath,