ppcos 1.0.2 → 1.0.4

package/lib/commands/status.js

@@ -85,8 +85,9 @@ function findCustomSkills(clientDir, manifest) {
   // Get managed skill directories from manifest
   const managedSkillDirs = new Set();
   for (const path of Object.keys(manifest.managedFiles)) {
-    if (path.startsWith('.claude/skills/')) {
-      const parts = path.split('/');
+    const normalized = path.replace(/\\/g, '/');
+    if (normalized.startsWith('.claude/skills/')) {
+      const parts = normalized.split('/');
       if (parts.length >= 3) {
         managedSkillDirs.add(parts[2]);
       }

package/lib/commands/update.js

@@ -5,7 +5,7 @@
  */
 
 import { readFileSync, writeFileSync, existsSync, readdirSync, unlinkSync } from 'node:fs';
-import { join, dirname } from 'node:path';
+import { join, dirname, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createInterface } from 'node:readline';
 import {
@@ -105,6 +105,119 @@ function migrateSettingsDenyRules(clientDir) {
   }
 }
 
+/**
+ * One-time migration: merge hooks config into settings.local.json
+ * Adds missing hook events without touching existing ones
+ */
+function migrateSettingsHooks(clientDir) {
+  const settingsPath = join(clientDir, '.claude', 'settings.local.json');
+  if (!existsSync(settingsPath)) return;
+
+  const requiredHooks = {
+    SessionStart: [
+      {
+        matcher: 'startup|resume|clear',
+        hooks: [
+          {
+            type: 'command',
+            command: '.claude/hooks/session-context-check.sh',
+            timeout: 30,
+            statusMessage: 'Checking context freshness...'
+          }
+        ]
+      }
+    ],
+    Stop: [
+      {
+        hooks: [
+          {
+            type: 'command',
+            command: '.claude/hooks/stop-memory-check.sh',
+            timeout: 10,
+            statusMessage: 'Checking memory log...'
+          }
+        ]
+      }
+    ],
+    PostCompact: [
+      {
+        hooks: [
+          {
+            type: 'command',
+            command: '.claude/hooks/post-compact-reminder.sh',
+            timeout: 30,
+            statusMessage: 'Restoring context after compaction...'
+          }
+        ]
+      }
+    ]
+  };
+
+  try {
+    const settings = JSON.parse(readFileSync(settingsPath, 'utf8'));
+    if (!settings.hooks) settings.hooks = {};
+
+    const added = [];
+    for (const [event, config] of Object.entries(requiredHooks)) {
+      if (!settings.hooks[event]) {
+        settings.hooks[event] = config;
+        added.push(event);
+      }
+    }
+
+    if (added.length === 0) return;
+
+    writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
+    logger.info(`  Added ${added.length} hook${added.length !== 1 ? 's' : ''} to settings.local.json (${added.join(', ')})`);
+  } catch {
+    // Don't fail update over migration
+  }
+}
+
+/**
+ * One-time migration: normalize backslash manifest keys to forward slashes.
+ * On Windows, getAllFiles() returned backslash paths which were stored as manifest keys.
+ * This normalizes them so lookups work cross-platform.
+ */
+function migrateManifestKeys(manifest) {
+  let fixed = 0;
+  for (const [key, value] of Object.entries(manifest.managedFiles)) {
+    const normalized = key.replace(/\\/g, '/');
+    if (normalized !== key) {
+      delete manifest.managedFiles[key];
+      manifest.managedFiles[normalized] = value;
+      fixed++;
+    }
+  }
+  for (const conflict of (manifest.conflicts || [])) {
+    if (conflict.file) {
+      conflict.file = conflict.file.replace(/\\/g, '/');
+    }
+  }
+  if (fixed > 0) {
+    logger.info(`  Normalized ${fixed} manifest key${fixed !== 1 ? 's' : ''}`);
+  }
+}
+
+/**
+ * One-time migration: fix managedType for config files.
+ * On Windows, isConfigFile() failed due to backslash paths, so config files
+ * got stored with managedType 'update' instead of 'config'.
+ * This corrects existing manifests in-place (before detectModifications runs).
+ */
+function migrateConfigManagedTypes(manifest) {
+  let fixed = 0;
+  for (const [path, info] of Object.entries(manifest.managedFiles)) {
+    if (isConfigFile(path) && info.managedType !== 'config') {
+      info.managedType = 'config';
+      fixed++;
+    }
+  }
+  if (fixed > 0) {
+    logger.info(`  Fixed managedType for ${fixed} config file${fixed !== 1 ? 's' : ''}`);
+  }
+}
+
 /**
  * Find all client directories with .managed.json
  * @returns {string[]} Array of client names
@@ -220,6 +333,21 @@ async function backupFiles(clientDir, files) {
   const { writeFile } = await import('node:fs/promises');
   await writeFile(join(backupDir, 'manifest.txt'), manifestContent);
 
+  // Verify all files were actually backed up before returning
+  const { readFileSync } = await import('node:fs');
+  for (const relativePath of files) {
+    const backedUpPath = join(backupDir, relativePath);
+    if (!existsSync(backedUpPath)) {
+      throw new Error(`Backup verification failed: ${relativePath} was not created in ${backupDir}`);
+    }
+    // Verify content matches source (guards against empty/placeholder files from cloud sync)
+    const srcContent = readFileSync(join(clientDir, relativePath));
+    const backupContent = readFileSync(backedUpPath);
+    if (!srcContent.equals(backupContent)) {
+      throw new Error(`Backup verification failed: ${relativePath} content mismatch (possible cloud sync interference)`);
+    }
+  }
+
   return backupDir;
 }
 
@@ -252,6 +380,9 @@ async function updateClient(clientName, basePathOrOptions = {}, options = {}) {
   // Migrations for existing clients
   await ensureMemoryFolder(clientDir);
   migrateSettingsDenyRules(clientDir);
+  migrateSettingsHooks(clientDir);
+  migrateManifestKeys(manifest);
+  migrateConfigManagedTypes(manifest);
 
   // Check if already up to date
   if (currentVersion === packageVersion) {
@@ -315,9 +446,16 @@ async function updateClient(clientName, basePathOrOptions = {}, options = {}) {
     }
 
     if (resolution === 'backup') {
-      const backupDir = await backupFiles(clientDir, modifiedNonOrphans);
-      backedUpFiles = modifiedNonOrphans;
-      console.log(`  Backed up ${modifiedNonOrphans.length} modified files to ${backupDir.replace(clientDir + '/', '')}`);
+      try {
+        const backupDir = await backupFiles(clientDir, modifiedNonOrphans);
+        backedUpFiles = modifiedNonOrphans;
+        const relativePath = backupDir.replace(clientDir + sep, '');
+        console.log(`  Backed up ${modifiedNonOrphans.length} modified files to ${relativePath}`);
+      } catch (err) {
+        logger.error(`  Backup failed: ${err.message}`);
+        logger.error('  Update aborted — no files were overwritten.');
+        return { status: 'cancelled' };
+      }
     }
   }
 
@@ -345,16 +483,28 @@ async function updateClient(clientName, basePathOrOptions = {}, options = {}) {
     const srcPath = join(basePath, relativePath);
     const destPath = join(clientDir, relativePath);
 
+    const srcChecksum = await calculateChecksum(srcPath);
     await copyFileWithDirs(srcPath, destPath);
 
-    const checksum = await calculateChecksum(destPath);
+    // Verify copy integrity (guards against cloud sync placeholder files)
+    let destChecksum = await calculateChecksum(destPath);
+    if (destChecksum !== srcChecksum) {
+      // Retry once — cloud sync may have interfered
+      await copyFileWithDirs(srcPath, destPath);
+      destChecksum = await calculateChecksum(destPath);
+      if (destChecksum !== srcChecksum) {
+        logger.error(`  File write failed for ${relativePath} (possible cloud sync interference).`);
+        logger.error('  Update aborted — try running update again.');
+        return { status: 'cancelled' };
+      }
+    }
 
     // Preserve managedType from existing manifest or determine new
     const existingEntry = manifest.managedFiles[relativePath];
     const managedType = existingEntry?.managedType || getManagedType(relativePath);
 
     updatedFiles[relativePath] = {
-      checksum,
+      checksum: srcChecksum,
       version: packageVersion,
       managedType
     };
@@ -366,8 +516,15 @@ async function updateClient(clientName, basePathOrOptions = {}, options = {}) {
     // Back up modified orphans before removing
     const modifiedOrphans = orphanedFiles.filter(f => mods.modified.includes(f));
     if (modifiedOrphans.length > 0) {
-      const backupDir = await backupFiles(clientDir, modifiedOrphans);
-      console.log(`  Backed up ${modifiedOrphans.length} modified removed file${modifiedOrphans.length !== 1 ? 's' : ''} to ${backupDir.replace(clientDir + '/', '')}`);
+      try {
+        const backupDir = await backupFiles(clientDir, modifiedOrphans);
+        const relPath = backupDir.replace(clientDir + sep, '');
+        console.log(`  Backed up ${modifiedOrphans.length} modified removed file${modifiedOrphans.length !== 1 ? 's' : ''} to ${relPath}`);
+      } catch (err) {
+        logger.error(`  Backup of removed files failed: ${err.message}`);
+        logger.error('  Update aborted — no files were removed.');
+        return { status: 'cancelled' };
+      }
     }
 
     for (const relativePath of orphanedFiles) {

package/lib/utils/fs-helpers.js

@@ -45,7 +45,7 @@ export async function getAllFiles(dir, baseDir = dir) {
     if (entry.isDirectory()) {
       files.push(...await getAllFiles(fullPath, baseDir));
     } else {
-      files.push(relative(baseDir, fullPath));
+      files.push(relative(baseDir, fullPath).replace(/\\/g, '/'));
     }
   }
 
@@ -67,7 +67,7 @@ export function getAllFilesSync(dir, baseDir = dir) {
     if (entry.isDirectory()) {
       files.push(...getAllFilesSync(fullPath, baseDir));
     } else {
-      files.push(relative(baseDir, fullPath));
+      files.push(relative(baseDir, fullPath).replace(/\\/g, '/'));
     }
   }
 

package/lib/utils/manifest.js

@@ -25,7 +25,8 @@ const CONFIG_ONLY_FILES = new Set([
  * @returns {boolean}
  */
 export function isConfigFile(relativePath) {
-  return CONFIG_ONLY_FILES.has(relativePath);
+  // Normalize backslashes to forward slashes for Windows compatibility
+  return CONFIG_ONLY_FILES.has(relativePath.replace(/\\/g, '/'));
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ppcos",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "CLI tool to manage Google Ads AI workflow skills and agents for Claude Code",
   "type": "module",
   "bin": {