@thejoseki/clawform 2.3.1 → 2.3.2

package/src/commands/diff.js

@@ -1,39 +1,39 @@
-import { readFile } from 'node:fs/promises';
-import { existsSync } from 'node:fs';
-import { GetTemplateCommand } from '@aws-sdk/client-cloudformation';
-import { createPatch } from 'diff';
-import chalk from 'chalk';
-import { logger } from '../lib/logger.js';
-import { cfnClient } from '../lib/aws-client.js';
-
-export default async function diff({ stack, file }) {
-  const localPath = file ?? `cfn/${stack}.yaml`;
-  logger.step(`clawform diff ${stack}  ↔  ${localPath}`);
-
-  if (!existsSync(localPath)) {
-    throw new Error(`Local template not found: ${localPath}. Pass --file <path> to override.`);
-  }
-  // Normalize line endings before comparison. CFN's GetTemplate returns LF, but
-  // fs.readFile preserves whatever bytes are on disk — on Windows checkouts (git's
-  // default core.autocrlf=true) every line of an identical template differs by a
-  // trailing \r, producing a wall-of-red diff that destroys the command's value.
-  const local = (await readFile(localPath, 'utf8')).replace(/\r\n/g, '\n');
-
-  const client = cfnClient();
-  const out = await client.send(new GetTemplateCommand({ StackName: stack, TemplateStage: 'Original' }));
-  const live = (out.TemplateBody ?? '').replace(/\r\n/g, '\n');
-
-  if (live === local) {
-    logger.ok('No diff. Local template matches live stack.');
-    return;
-  }
-
-  const patch = createPatch(stack, live, local, 'live', 'local', { context: 3 });
-  for (const line of patch.split('\n')) {
-    if (line.startsWith('+++ ') || line.startsWith('--- ')) console.log(chalk.bold(line));
-    else if (line.startsWith('+')) console.log(chalk.green(line));
-    else if (line.startsWith('-')) console.log(chalk.red(line));
-    else if (line.startsWith('@@')) console.log(chalk.cyan(line));
-    else console.log(line);
-  }
-}
+import { readFile } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
+import { GetTemplateCommand } from '@aws-sdk/client-cloudformation';
+import { createPatch } from 'diff';
+import chalk from 'chalk';
+import { logger } from '../lib/logger.js';
+import { cfnClient } from '../lib/aws-client.js';
+
+export default async function diff({ stack, file }) {
+  const localPath = file ?? `cfn/${stack}.yaml`;
+  logger.step(`clawform diff ${stack}  ↔  ${localPath}`);
+
+  if (!existsSync(localPath)) {
+    throw new Error(`Local template not found: ${localPath}. Pass --file <path> to override.`);
+  }
+  // Normalize line endings before comparison. CFN's GetTemplate returns LF, but
+  // fs.readFile preserves whatever bytes are on disk — on Windows checkouts (git's
+  // default core.autocrlf=true) every line of an identical template differs by a
+  // trailing \r, producing a wall-of-red diff that destroys the command's value.
+  const local = (await readFile(localPath, 'utf8')).replace(/\r\n/g, '\n');
+
+  const client = cfnClient();
+  const out = await client.send(new GetTemplateCommand({ StackName: stack, TemplateStage: 'Original' }));
+  const live = (out.TemplateBody ?? '').replace(/\r\n/g, '\n');
+
+  if (live === local) {
+    logger.ok('No diff. Local template matches live stack.');
+    return;
+  }
+
+  const patch = createPatch(stack, live, local, 'live', 'local', { context: 3 });
+  for (const line of patch.split('\n')) {
+    if (line.startsWith('+++ ') || line.startsWith('--- ')) console.log(chalk.bold(line));
+    else if (line.startsWith('+')) console.log(chalk.green(line));
+    else if (line.startsWith('-')) console.log(chalk.red(line));
+    else if (line.startsWith('@@')) console.log(chalk.cyan(line));
+    else console.log(line);
+  }
+}

package/src/commands/drift.js

@@ -1,35 +1,35 @@
-import chalk from 'chalk';
-import { logger } from '../lib/logger.js';
-import { cfnClient } from '../lib/aws-client.js';
-import { detectAndWait, listResourceDrifts } from '../aws/drift.js';
-
-export default async function drift({ stack }) {
-  logger.step(`clawform drift ${stack}`);
-  const client = cfnClient();
-
-  logger.info('Detecting drift (this can take a few minutes)…');
-  const summary = await detectAndWait(client, { stackName: stack });
-  logger.info(`StackDriftStatus: ${summary.stackDriftStatus}  ·  drifted resources: ${summary.driftedResourceCount}`);
-
-  if (summary.stackDriftStatus === 'IN_SYNC') {
-    logger.ok('No drift.');
-    return;
-  }
-
-  const drifts = await listResourceDrifts(client, stack);
-  for (const d of drifts) {
-    logger.info('');
-    logger.info(`${chalk.yellow(d.driftStatus)}  ${d.logicalId} (${d.resourceType})`);
-    for (const p of d.propertyDifferences) {
-      const status = p.DifferenceType ?? '?';
-      logger.info(`  ${chalk.dim('@')}${p.PropertyPath ?? '/'}  ${status}`);
-      if (p.ExpectedValue !== undefined) logger.info(`    expected: ${truncate(p.ExpectedValue)}`);
-      if (p.ActualValue !== undefined)   logger.info(`    actual:   ${truncate(p.ActualValue)}`);
-    }
-  }
-}
-
-function truncate(v, max = 120) {
-  const s = typeof v === 'string' ? v : JSON.stringify(v);
-  return s.length > max ? s.slice(0, max - 1) + '…' : s;
-}
+import chalk from 'chalk';
+import { logger } from '../lib/logger.js';
+import { cfnClient } from '../lib/aws-client.js';
+import { detectAndWait, listResourceDrifts } from '../aws/drift.js';
+
+export default async function drift({ stack }) {
+  logger.step(`clawform drift ${stack}`);
+  const client = cfnClient();
+
+  logger.info('Detecting drift (this can take a few minutes)…');
+  const summary = await detectAndWait(client, { stackName: stack });
+  logger.info(`StackDriftStatus: ${summary.stackDriftStatus}  ·  drifted resources: ${summary.driftedResourceCount}`);
+
+  if (summary.stackDriftStatus === 'IN_SYNC') {
+    logger.ok('No drift.');
+    return;
+  }
+
+  const drifts = await listResourceDrifts(client, stack);
+  for (const d of drifts) {
+    logger.info('');
+    logger.info(`${chalk.yellow(d.driftStatus)}  ${d.logicalId} (${d.resourceType})`);
+    for (const p of d.propertyDifferences) {
+      const status = p.DifferenceType ?? '?';
+      logger.info(`  ${chalk.dim('@')}${p.PropertyPath ?? '/'}  ${status}`);
+      if (p.ExpectedValue !== undefined) logger.info(`    expected: ${truncate(p.ExpectedValue)}`);
+      if (p.ActualValue !== undefined)   logger.info(`    actual:   ${truncate(p.ActualValue)}`);
+    }
+  }
+}
+
+function truncate(v, max = 120) {
+  const s = typeof v === 'string' ? v : JSON.stringify(v);
+  return s.length > max ? s.slice(0, max - 1) + '…' : s;
+}

package/src/commands/init-plugin.js

@@ -115,7 +115,7 @@ export function assemblePlugin({ packageRoot, destDir, entries, licenseRecord, n
   return manifest;
 }
 
-export default async function initPlugin({ scope = 'global' } = {}, {
+export default async function initPlugin({ scope = 'global', refresh = false } = {}, {
   packageRoot = PACKAGE_ROOT,
   homedir = osHomedir,
   client = resolveClient(),
@@ -137,16 +137,16 @@ export default async function initPlugin({ scope = 'global' } = {}, {
     licenseKey: readLicense()?.key,
     serviceUrl: KIT_SERVICE_URL,
     cacheDir: vendorHome,
+    refresh,
   });
 
   assemblePlugin({ packageRoot, destDir: pluginDir, entries, licenseRecord: readLicense() });
   log(`Plugin materialized at ${pluginDir}`);
 
-  // Register with Claude Code. The exact marketplace/scope flags are Claude
-  // Code semantics that must be confirmed against a live install (clean-room
-  // C3) — the runner is injected so this stays testable, and --project vs
-  // --global is passed through for that verification.
-  const scopeFlag = scope === 'project' ? ['--project'] : [];
+  // Register with Claude Code. Both subcommands take `--scope user|project|local`
+  // (default user); clawform "global" maps to user (all projects), "project" to
+  // project (./.claude). The runner is injected so this stays testable.
+  const scopeFlag = ['--scope', scope === 'project' ? 'project' : 'user'];
   const add = await runClaude(['plugin', 'marketplace', 'add', pluginDir, ...scopeFlag]);
   if (add.code !== 0) throw new Error(`claude plugin marketplace add failed: ${add.stderr ?? `exit ${add.code}`}`);
   const install = await runClaude(['plugin', 'install', 'clawform@clawform', ...scopeFlag]);