@thejoseki/clawform 2.3.1 → 2.3.2

package/src/aws/changeset.js

@@ -1,231 +1,231 @@
-import {
-  CreateChangeSetCommand,
-  DescribeChangeSetCommand,
-  DeleteChangeSetCommand,
-  DescribeStacksCommand,
-  DescribeStackEventsCommand,
-  ExecuteChangeSetCommand,
-} from '@aws-sdk/client-cloudformation';
-import { isDataResource } from '../lib/constants.js';
-
-const DEPLOYABLE_FROM_UPDATE = new Set([
-  'CREATE_COMPLETE',
-  'UPDATE_COMPLETE',
-  'UPDATE_ROLLBACK_COMPLETE',
-  'IMPORT_COMPLETE',
-  'IMPORT_ROLLBACK_COMPLETE',
-]);
-
-const TERMINAL_EXECUTE_STATUSES = new Set([
-  'CREATE_COMPLETE',
-  'UPDATE_COMPLETE',
-  'ROLLBACK_COMPLETE',
-  'UPDATE_ROLLBACK_COMPLETE',
-  'CREATE_FAILED',
-  'ROLLBACK_FAILED',
-  'UPDATE_ROLLBACK_FAILED',
-  'UPDATE_FAILED',
-  'DELETE_COMPLETE',
-  'DELETE_FAILED',
-]);
-
-const EMPTY_CHANGESET_RE = /didn'?t contain changes|no updates are to be performed/i;
-
-export async function stackStatus(client, stackName) {
-  try {
-    const out = await client.send(new DescribeStacksCommand({ StackName: stackName }));
-    const stack = out.Stacks?.[0];
-    if (!stack) return { exists: false };
-    return { exists: true, status: stack.StackStatus, stack };
-  } catch (err) {
-    if (err.name === 'ValidationError' && /does not exist/i.test(err.message ?? '')) {
-      return { exists: false };
-    }
-    throw err;
-  }
-}
-
-export function decideChangeSetType({ exists, status }) {
-  if (!exists) return 'CREATE';
-  if (status === 'REVIEW_IN_PROGRESS') return 'CREATE';
-  if (DEPLOYABLE_FROM_UPDATE.has(status)) return 'UPDATE';
-  if (/_IN_PROGRESS$/.test(status)) {
-    throw new Error(`Stack is ${status}; another operation is running. Wait or check the console.`);
-  }
-  throw new Error(`Stack is in ${status}; use /rollback to recover before deploying.`);
-}
-
-export function changeSetName(prefix = 'claude') {
-  const d = new Date();
-  const pad = (n) => String(n).padStart(2, '0');
-  const stamp = `${d.getUTCFullYear()}${pad(d.getUTCMonth() + 1)}${pad(d.getUTCDate())}-${pad(d.getUTCHours())}${pad(d.getUTCMinutes())}${pad(d.getUTCSeconds())}`;
-  return `${prefix}-${stamp}`;
-}
-
-export async function createAndWait(client, {
-  stackName,
-  changeSetType,
-  templateBody,
-  parameters = [],
-  tags = [],
-  capabilities = [],
-  name = changeSetName(),
-  pollIntervalMs = 2000,
-  timeoutMs = 5 * 60 * 1000,
-}) {
-  await client.send(new CreateChangeSetCommand({
-    StackName: stackName,
-    ChangeSetName: name,
-    ChangeSetType: changeSetType,
-    TemplateBody: templateBody,
-    Parameters: parameters,
-    Tags: tags,
-    Capabilities: capabilities,
-  }));
-
-  const started = Date.now();
-  while (true) {
-    const desc = await describeFull(client, stackName, name);
-    if (desc.Status === 'CREATE_COMPLETE') {
-      return {
-        name,
-        id: desc.ChangeSetId,
-        isEmpty: false,
-        changes: desc.Changes ?? [],
-        statusReason: desc.StatusReason ?? null,
-      };
-    }
-    if (desc.Status === 'FAILED') {
-      if (EMPTY_CHANGESET_RE.test(desc.StatusReason ?? '')) {
-        await safeDelete(client, stackName, name);
-        return { name, id: desc.ChangeSetId, isEmpty: true, changes: [], statusReason: desc.StatusReason };
-      }
-      throw new Error(`Change-set creation failed: ${desc.StatusReason ?? '(no reason)'}`);
-    }
-    if (Date.now() - started > timeoutMs) {
-      throw new Error(`Timed out after ${Math.round(timeoutMs / 1000)}s waiting for change-set ${name} to be ready (last status: ${desc.Status}).`);
-    }
-    await sleep(pollIntervalMs);
-  }
-}
-
-async function describeFull(client, stackName, name) {
-  const all = [];
-  let nextToken;
-  let first;
-  do {
-    const out = await client.send(new DescribeChangeSetCommand({
-      StackName: stackName,
-      ChangeSetName: name,
-      NextToken: nextToken,
-    }));
-    if (!first) first = out;
-    for (const c of out.Changes ?? []) all.push(c);
-    nextToken = out.NextToken;
-  } while (nextToken);
-  return { ...first, Changes: all };
-}
-
-async function safeDelete(client, stackName, name) {
-  try {
-    await client.send(new DeleteChangeSetCommand({ StackName: stackName, ChangeSetName: name }));
-  } catch {
-    // Empty change-sets sometimes auto-clean; ignore deletion errors here.
-  }
-}
-
-export function classifyChanges(changes) {
-  const buckets = { add: [], modify: [], replace: [], remove: [], dataResourceReplace: [] };
-  for (const c of changes) {
-    if (c.Type !== 'Resource' || !c.ResourceChange) continue;
-    const rc = c.ResourceChange;
-    const entry = {
-      logicalId: rc.LogicalResourceId,
-      physicalId: rc.PhysicalResourceId ?? null,
-      resourceType: rc.ResourceType,
-      replacement: rc.Replacement,
-      scope: rc.Scope ?? [],
-      detailsTargets: (rc.Details ?? []).map((d) => d.Target?.Attribute).filter(Boolean),
-    };
-    switch (rc.Action) {
-      case 'Add':
-        buckets.add.push(entry);
-        break;
-      case 'Remove':
-        buckets.remove.push(entry);
-        break;
-      case 'Modify':
-        if (rc.Replacement === 'True' || rc.Replacement === 'Conditional') {
-          buckets.replace.push(entry);
-          if (isDataResource(rc.ResourceType)) buckets.dataResourceReplace.push(entry);
-        } else {
-          buckets.modify.push(entry);
-        }
-        break;
-      default:
-        buckets.modify.push(entry);
-    }
-  }
-  return buckets;
-}
-
-export async function executeAndPoll(client, {
-  stackName,
-  changeSetName: name,
-  onEvent = () => {},
-  pollIntervalMs = 3000,
-  timeoutMs = 60 * 60 * 1000,
-}) {
-  await client.send(new ExecuteChangeSetCommand({ StackName: stackName, ChangeSetName: name }));
-
-  const seen = new Set();
-  const started = Date.now();
-  while (true) {
-    const events = await fetchEvents(client, stackName, seen);
-    for (const ev of events) {
-      if (seen.has(ev.EventId)) continue;
-      seen.add(ev.EventId);
-      onEvent(ev);
-    }
-
-    const { stack } = await stackStatus(client, stackName);
-    const status = stack?.StackStatus;
-    if (status && TERMINAL_EXECUTE_STATUSES.has(status)) {
-      return { stackStatus: status, stack };
-    }
-    if (Date.now() - started > timeoutMs) {
-      throw new Error(`Timed out after ${Math.round(timeoutMs / 60000)}m waiting for stack ${stackName} (last status: ${status}).`);
-    }
-    await sleep(pollIntervalMs);
-  }
-}
-
-// Paginate DescribeStackEvents until we encounter an event we've already narrated.
-// DescribeStackEvents returns newest-first within a page AND pages are newest-first,
-// so once we hit a known EventId every older event is also already in `seen` — safe
-// to stop. Without this, a poll window emitting >100 events (large stacks, nested-
-// stack expansion, rollback fan-out) silently drops the older end off page 1 and
-// onEvent is never called for them — the operator misses CREATE_FAILED rows that
-// scrolled off between polls. (Tracked as merged_bug_008 from ultrareview.)
-export async function fetchEvents(client, stackName, seen = new Set()) {
-  const events = [];
-  let nextToken;
-  do {
-    const resp = await client.send(new DescribeStackEventsCommand({
-      StackName: stackName,
-      NextToken: nextToken,
-    }));
-    let stopHere = false;
-    for (const ev of resp.StackEvents ?? []) {
-      if (seen.has(ev.EventId)) { stopHere = true; break; }
-      events.push(ev);
-    }
-    if (stopHere) break;
-    nextToken = resp.NextToken;
-  } while (nextToken);
-  return events.reverse(); // present oldest-first for narration
-}
-
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
+import {
+  CreateChangeSetCommand,
+  DescribeChangeSetCommand,
+  DeleteChangeSetCommand,
+  DescribeStacksCommand,
+  DescribeStackEventsCommand,
+  ExecuteChangeSetCommand,
+} from '@aws-sdk/client-cloudformation';
+import { isDataResource } from '../lib/constants.js';
+
+const DEPLOYABLE_FROM_UPDATE = new Set([
+  'CREATE_COMPLETE',
+  'UPDATE_COMPLETE',
+  'UPDATE_ROLLBACK_COMPLETE',
+  'IMPORT_COMPLETE',
+  'IMPORT_ROLLBACK_COMPLETE',
+]);
+
+const TERMINAL_EXECUTE_STATUSES = new Set([
+  'CREATE_COMPLETE',
+  'UPDATE_COMPLETE',
+  'ROLLBACK_COMPLETE',
+  'UPDATE_ROLLBACK_COMPLETE',
+  'CREATE_FAILED',
+  'ROLLBACK_FAILED',
+  'UPDATE_ROLLBACK_FAILED',
+  'UPDATE_FAILED',
+  'DELETE_COMPLETE',
+  'DELETE_FAILED',
+]);
+
+const EMPTY_CHANGESET_RE = /didn'?t contain changes|no updates are to be performed/i;
+
+export async function stackStatus(client, stackName) {
+  try {
+    const out = await client.send(new DescribeStacksCommand({ StackName: stackName }));
+    const stack = out.Stacks?.[0];
+    if (!stack) return { exists: false };
+    return { exists: true, status: stack.StackStatus, stack };
+  } catch (err) {
+    if (err.name === 'ValidationError' && /does not exist/i.test(err.message ?? '')) {
+      return { exists: false };
+    }
+    throw err;
+  }
+}
+
+export function decideChangeSetType({ exists, status }) {
+  if (!exists) return 'CREATE';
+  if (status === 'REVIEW_IN_PROGRESS') return 'CREATE';
+  if (DEPLOYABLE_FROM_UPDATE.has(status)) return 'UPDATE';
+  if (/_IN_PROGRESS$/.test(status)) {
+    throw new Error(`Stack is ${status}; another operation is running. Wait or check the console.`);
+  }
+  throw new Error(`Stack is in ${status}; use /rollback to recover before deploying.`);
+}
+
+export function changeSetName(prefix = 'claude') {
+  const d = new Date();
+  const pad = (n) => String(n).padStart(2, '0');
+  const stamp = `${d.getUTCFullYear()}${pad(d.getUTCMonth() + 1)}${pad(d.getUTCDate())}-${pad(d.getUTCHours())}${pad(d.getUTCMinutes())}${pad(d.getUTCSeconds())}`;
+  return `${prefix}-${stamp}`;
+}
+
+export async function createAndWait(client, {
+  stackName,
+  changeSetType,
+  templateBody,
+  parameters = [],
+  tags = [],
+  capabilities = [],
+  name = changeSetName(),
+  pollIntervalMs = 2000,
+  timeoutMs = 5 * 60 * 1000,
+}) {
+  await client.send(new CreateChangeSetCommand({
+    StackName: stackName,
+    ChangeSetName: name,
+    ChangeSetType: changeSetType,
+    TemplateBody: templateBody,
+    Parameters: parameters,
+    Tags: tags,
+    Capabilities: capabilities,
+  }));
+
+  const started = Date.now();
+  while (true) {
+    const desc = await describeFull(client, stackName, name);
+    if (desc.Status === 'CREATE_COMPLETE') {
+      return {
+        name,
+        id: desc.ChangeSetId,
+        isEmpty: false,
+        changes: desc.Changes ?? [],
+        statusReason: desc.StatusReason ?? null,
+      };
+    }
+    if (desc.Status === 'FAILED') {
+      if (EMPTY_CHANGESET_RE.test(desc.StatusReason ?? '')) {
+        await safeDelete(client, stackName, name);
+        return { name, id: desc.ChangeSetId, isEmpty: true, changes: [], statusReason: desc.StatusReason };
+      }
+      throw new Error(`Change-set creation failed: ${desc.StatusReason ?? '(no reason)'}`);
+    }
+    if (Date.now() - started > timeoutMs) {
+      throw new Error(`Timed out after ${Math.round(timeoutMs / 1000)}s waiting for change-set ${name} to be ready (last status: ${desc.Status}).`);
+    }
+    await sleep(pollIntervalMs);
+  }
+}
+
+async function describeFull(client, stackName, name) {
+  const all = [];
+  let nextToken;
+  let first;
+  do {
+    const out = await client.send(new DescribeChangeSetCommand({
+      StackName: stackName,
+      ChangeSetName: name,
+      NextToken: nextToken,
+    }));
+    if (!first) first = out;
+    for (const c of out.Changes ?? []) all.push(c);
+    nextToken = out.NextToken;
+  } while (nextToken);
+  return { ...first, Changes: all };
+}
+
+async function safeDelete(client, stackName, name) {
+  try {
+    await client.send(new DeleteChangeSetCommand({ StackName: stackName, ChangeSetName: name }));
+  } catch {
+    // Empty change-sets sometimes auto-clean; ignore deletion errors here.
+  }
+}
+
+export function classifyChanges(changes) {
+  const buckets = { add: [], modify: [], replace: [], remove: [], dataResourceReplace: [] };
+  for (const c of changes) {
+    if (c.Type !== 'Resource' || !c.ResourceChange) continue;
+    const rc = c.ResourceChange;
+    const entry = {
+      logicalId: rc.LogicalResourceId,
+      physicalId: rc.PhysicalResourceId ?? null,
+      resourceType: rc.ResourceType,
+      replacement: rc.Replacement,
+      scope: rc.Scope ?? [],
+      detailsTargets: (rc.Details ?? []).map((d) => d.Target?.Attribute).filter(Boolean),
+    };
+    switch (rc.Action) {
+      case 'Add':
+        buckets.add.push(entry);
+        break;
+      case 'Remove':
+        buckets.remove.push(entry);
+        break;
+      case 'Modify':
+        if (rc.Replacement === 'True' || rc.Replacement === 'Conditional') {
+          buckets.replace.push(entry);
+          if (isDataResource(rc.ResourceType)) buckets.dataResourceReplace.push(entry);
+        } else {
+          buckets.modify.push(entry);
+        }
+        break;
+      default:
+        buckets.modify.push(entry);
+    }
+  }
+  return buckets;
+}
+
+export async function executeAndPoll(client, {
+  stackName,
+  changeSetName: name,
+  onEvent = () => {},
+  pollIntervalMs = 3000,
+  timeoutMs = 60 * 60 * 1000,
+}) {
+  await client.send(new ExecuteChangeSetCommand({ StackName: stackName, ChangeSetName: name }));
+
+  const seen = new Set();
+  const started = Date.now();
+  while (true) {
+    const events = await fetchEvents(client, stackName, seen);
+    for (const ev of events) {
+      if (seen.has(ev.EventId)) continue;
+      seen.add(ev.EventId);
+      onEvent(ev);
+    }
+
+    const { stack } = await stackStatus(client, stackName);
+    const status = stack?.StackStatus;
+    if (status && TERMINAL_EXECUTE_STATUSES.has(status)) {
+      return { stackStatus: status, stack };
+    }
+    if (Date.now() - started > timeoutMs) {
+      throw new Error(`Timed out after ${Math.round(timeoutMs / 60000)}m waiting for stack ${stackName} (last status: ${status}).`);
+    }
+    await sleep(pollIntervalMs);
+  }
+}
+
+// Paginate DescribeStackEvents until we encounter an event we've already narrated.
+// DescribeStackEvents returns newest-first within a page AND pages are newest-first,
+// so once we hit a known EventId every older event is also already in `seen` — safe
+// to stop. Without this, a poll window emitting >100 events (large stacks, nested-
+// stack expansion, rollback fan-out) silently drops the older end off page 1 and
+// onEvent is never called for them — the operator misses CREATE_FAILED rows that
+// scrolled off between polls. (Tracked as merged_bug_008 from ultrareview.)
+export async function fetchEvents(client, stackName, seen = new Set()) {
+  const events = [];
+  let nextToken;
+  do {
+    const resp = await client.send(new DescribeStackEventsCommand({
+      StackName: stackName,
+      NextToken: nextToken,
+    }));
+    let stopHere = false;
+    for (const ev of resp.StackEvents ?? []) {
+      if (seen.has(ev.EventId)) { stopHere = true; break; }
+      events.push(ev);
+    }
+    if (stopHere) break;
+    nextToken = resp.NextToken;
+  } while (nextToken);
+  return events.reverse(); // present oldest-first for narration
+}
+
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}

package/src/aws/drift.js

@@ -1,59 +1,59 @@
-import {
-  DetectStackDriftCommand,
-  DescribeStackDriftDetectionStatusCommand,
-  DescribeStackResourceDriftsCommand,
-} from '@aws-sdk/client-cloudformation';
-
-const TERMINAL = new Set(['DETECTION_COMPLETE', 'DETECTION_FAILED']);
-
-export async function detectAndWait(client, {
-  stackName,
-  pollIntervalMs = 3000,
-  timeoutMs = 10 * 60 * 1000,
-}) {
-  const { StackDriftDetectionId } = await client.send(new DetectStackDriftCommand({ StackName: stackName }));
-
-  const started = Date.now();
-  while (true) {
-    const out = await client.send(new DescribeStackDriftDetectionStatusCommand({ StackDriftDetectionId }));
-    if (TERMINAL.has(out.DetectionStatus)) {
-      if (out.DetectionStatus === 'DETECTION_FAILED') {
-        throw new Error(`Drift detection failed for ${stackName}: ${out.DetectionStatusReason ?? '(no reason)'}`);
-      }
-      return {
-        stackDriftStatus: out.StackDriftStatus,
-        driftedResourceCount: out.DriftedStackResourceCount ?? 0,
-      };
-    }
-    if (Date.now() - started > timeoutMs) {
-      throw new Error(`Timed out after ${Math.round(timeoutMs / 60000)}m waiting for drift detection on ${stackName}.`);
-    }
-    await sleep(pollIntervalMs);
-  }
-}
-
-export async function listResourceDrifts(client, stackName, statusFilter = ['MODIFIED', 'DELETED']) {
-  const drifts = [];
-  let nextToken;
-  do {
-    const out = await client.send(new DescribeStackResourceDriftsCommand({
-      StackName: stackName,
-      StackResourceDriftStatusFilters: statusFilter,
-      NextToken: nextToken,
-    }));
-    for (const d of out.StackResourceDrifts ?? []) {
-      drifts.push({
-        logicalId: d.LogicalResourceId,
-        resourceType: d.ResourceType,
-        driftStatus: d.StackResourceDriftStatus,
-        propertyDifferences: d.PropertyDifferences ?? [],
-      });
-    }
-    nextToken = out.NextToken;
-  } while (nextToken);
-  return drifts;
-}
-
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
+import {
+  DetectStackDriftCommand,
+  DescribeStackDriftDetectionStatusCommand,
+  DescribeStackResourceDriftsCommand,
+} from '@aws-sdk/client-cloudformation';
+
+const TERMINAL = new Set(['DETECTION_COMPLETE', 'DETECTION_FAILED']);
+
+export async function detectAndWait(client, {
+  stackName,
+  pollIntervalMs = 3000,
+  timeoutMs = 10 * 60 * 1000,
+}) {
+  const { StackDriftDetectionId } = await client.send(new DetectStackDriftCommand({ StackName: stackName }));
+
+  const started = Date.now();
+  while (true) {
+    const out = await client.send(new DescribeStackDriftDetectionStatusCommand({ StackDriftDetectionId }));
+    if (TERMINAL.has(out.DetectionStatus)) {
+      if (out.DetectionStatus === 'DETECTION_FAILED') {
+        throw new Error(`Drift detection failed for ${stackName}: ${out.DetectionStatusReason ?? '(no reason)'}`);
+      }
+      return {
+        stackDriftStatus: out.StackDriftStatus,
+        driftedResourceCount: out.DriftedStackResourceCount ?? 0,
+      };
+    }
+    if (Date.now() - started > timeoutMs) {
+      throw new Error(`Timed out after ${Math.round(timeoutMs / 60000)}m waiting for drift detection on ${stackName}.`);
+    }
+    await sleep(pollIntervalMs);
+  }
+}
+
+export async function listResourceDrifts(client, stackName, statusFilter = ['MODIFIED', 'DELETED']) {
+  const drifts = [];
+  let nextToken;
+  do {
+    const out = await client.send(new DescribeStackResourceDriftsCommand({
+      StackName: stackName,
+      StackResourceDriftStatusFilters: statusFilter,
+      NextToken: nextToken,
+    }));
+    for (const d of out.StackResourceDrifts ?? []) {
+      drifts.push({
+        logicalId: d.LogicalResourceId,
+        resourceType: d.ResourceType,
+        driftStatus: d.StackResourceDriftStatus,
+        propertyDifferences: d.PropertyDifferences ?? [],
+      });
+    }
+    nextToken = out.NextToken;
+  } while (nextToken);
+  return drifts;
+}
+
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}