@ggdna/dna-gg 0.4.0 → 0.4.1

package/dna/_generated.json

@@ -5,7 +5,7 @@
       "name": "base",
       "package": "helix",
       "ecosystem": null,
-      "resolvedVersion": "1.7.0",
+      "resolvedVersion": "1.8.0",
       "via": null,
       "hash": "0x6883da335b415f9d"
     },
@@ -13,7 +13,7 @@
       "name": "dna-install",
       "package": "@ggdna/dna-install",
       "ecosystem": "node",
-      "resolvedVersion": "0.1.0",
+      "resolvedVersion": "0.1.1",
       "via": null,
       "hash": "0xbe88eb4256745ee1"
     },
@@ -21,7 +21,7 @@
       "name": "dna-index",
       "package": "@ggdna/dna-index",
       "ecosystem": "node",
-      "resolvedVersion": "0.1.0",
+      "resolvedVersion": "0.1.1",
       "via": null,
       "hash": "0x1d92b0add37a1ac7"
     },
@@ -31,19 +31,19 @@
       "ecosystem": null,
       "resolvedVersion": null,
       "via": null,
-      "hash": "0x51ccfc15107f2e9e"
+      "hash": "0x5b707abead2f6ae7"
     }
   ],
   "claude": {
     "claudeMdInclude": null,
     "claudeMdFromDna": true
   },
-  "baseVersion": "1.7.0",
+  "baseVersion": "1.8.0",
   "baseHash": "0x6883da335b415f9d",
   "instances": [
     {
       "path": ".claude/skills/cleanup/SKILL.md",
-      "hash": "0xc5c7b7940ab51b83"
+      "hash": "0xeaa18dbc86a24731"
     },
     {
       "path": ".claude/skills/commit/SKILL.md",
@@ -140,18 +140,6 @@
     {
       "path": "doc/templates/index-template.jsonc",
       "hash": "0x16c3a8d50c72ed6d"
-    },
-    {
-      "path": "scripts/delete-feature-branch.js",
-      "hash": "0x219ac0a3635ee644"
-    },
-    {
-      "path": "scripts/functions/colors.js",
-      "hash": "0xdfd97f3804665811"
-    },
-    {
-      "path": "scripts/functions/run-command.js",
-      "hash": "0x085b390fcb9256ab"
     }
   ]
 }

package/dna/dot-claude/skills/cleanup/SKILL.md

@@ -22,14 +22,32 @@ Stop and report if a repo still holds uncommitted or unmerged work.
 
 ## 2. Delete the feature branches
 
-In every repo that still sits on its feature branch:
+In every repo that still sits on its feature branch (never on `main`):
 
 ```bash
-node scripts/delete-feature-branch.js
+git rev-parse --abbrev-ref @{u} >/dev/null && git rev-list --count @{u}..HEAD
 ```
 
-The script switches to `main`, pulls, and deletes the branch only when it is
-fully merged.
+Stop and ask the user to push first if that count is not `0`.
+
+```bash
+git fetch
+git checkout main
+git pull origin main
+```
+
+A plain `git branch -d` refuses a squash-merged branch even though it is
+fully in `main` — test it with a merge instead:
+
+```bash
+git merge --no-commit --no-ff <branch>
+git status --porcelain
+git merge --abort
+```
+
+- Empty status → the branch is fully in `main`: `git branch -d <branch>`.
+- Non-empty status → not merged yet: `git checkout <branch>` and tell the
+  user to (create and) merge a pull request first.
 
 ## 3. Remove the ticket folder
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ggdna/dna-gg",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "DNA layer: gg CLI workflow guides, repo setup scripts and CI check",
   "keywords": [
     "dna",
@@ -28,11 +28,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@ggdna/dna-index": "^0.1.0",
-    "@ggdna/dna-install": "^0.1.0"
+    "@ggdna/dna-index": "^0.1.1",
+    "@ggdna/dna-install": "^0.1.1"
   },
   "devDependencies": {
-    "@types/node": "^26.5.0",
+    "@types/node": "^26.6.1",
     "prettier": "^3.9.6"
   },
   "scripts": {

package/dna/scripts/delete-feature-branch.js

@@ -1,97 +0,0 @@
-/**
- * @license
- * Copyright (c) dnaCopyrightHolder
- *
- * Use of this source code is governed by terms that can be
- * found in the LICENSE file in the root of this package.
- */
-
-import { gray, green, red, yellow } from './functions/colors.js';
-import { runCommand } from './functions/run-command.js';
-
-// Check for uncommitted changes
-function hasUncommittedChanges() {
-  console.log(gray('Check for uncommitted changes'));
-  const status = runCommand('git status --porcelain');
-  return status.length > 0;
-}
-
-// Check for unpushed commits
-function hasUnpushedCommits(branch) {
-  try {
-    console.log(gray('Check for unpushed commits'));
-    runCommand(`git rev-parse --abbrev-ref ${branch}@{u}`);
-    const ahead = runCommand(`git rev-list --count ${branch}@{u}..${branch}`);
-    return parseInt(ahead, 10) > 0;
-  } catch {
-    return true;
-  }
-}
-
-// Try a test merge into main and check if it introduces changes
-function isBranchEffectivelyMerged(featureBranch) {
-  console.log(gray('Check if feature was fully merged'));
-
-  try {
-    runCommand(`git merge --no-commit --no-ff ${featureBranch}`);
-    const changed = hasUncommittedChanges();
-    runCommand('git merge --abort');
-    return !changed;
-  } catch {
-    try {
-      runCommand('git merge --abort');
-    } catch {}
-    return false;
-  }
-}
-
-try {
-  console.log(gray('Get current branch name'));
-  const currentBranch = runCommand('git rev-parse --abbrev-ref HEAD');
-
-  if (currentBranch === 'main') {
-    console.log(yellow('Please call this script from a feature branch.'));
-    process.exit(0);
-  }
-
-  if (hasUncommittedChanges()) {
-    console.error(red('❌ You have uncommitted changes.'));
-    console.error(
-      yellow('Please commit or stash your changes before continuing.'),
-    );
-    process.exit(1);
-  }
-
-  if (hasUnpushedCommits(currentBranch)) {
-    console.error(red('❌ You have unpushed commits.'));
-    console.error(yellow('Please push your branch before continuing.'));
-    process.exit(1);
-  }
-
-  console.log(gray(`Fetching and pulling 'main'...`));
-  runCommand('git fetch');
-  runCommand('git checkout main');
-  runCommand('git pull origin main');
-
-  const isMerged = isBranchEffectivelyMerged(currentBranch);
-
-  if (isMerged) {
-    runCommand(`git branch -d ${currentBranch}`);
-    console.log(green(`✅ Branch '${currentBranch}' has been deleted.`));
-  } else {
-    console.error(
-      red(`❌ Branch '${currentBranch}' is not merged into 'main'.`),
-    );
-    console.log(
-      yellow(`Please (create and) merge a pull request and try again.`),
-    );
-    runCommand(`git checkout ${currentBranch}`);
-    console.log(gray(`Switched back to '${currentBranch}'.`));
-  }
-} catch (error) {
-  console.error(red(`Error: ${error.message}`));
-  try {
-    runCommand('git merge --abort');
-  } catch {}
-  process.exit(1);
-}

package/dna/scripts/functions/colors.js

@@ -1,27 +0,0 @@
-/**
- * @license
- * Copyright (c) dnaCopyrightHolder
- *
- * Use of this source code is governed by terms that can be
- * found in the LICENSE file in the root of this package.
- */
-
-export const red = (str) => `\x1b[31m${str}\x1b[0m`;
-export const green = (str) => `\x1b[32m${str}\x1b[0m`;
-export const yellow = (str) => `\x1b[33m${str}\x1b[0m`;
-export const blue = (str) => `\x1b[34m${str}\x1b[0m`;
-export const magenta = (str) => `\x1b[35m${str}\x1b[0m`;
-export const cyan = (str) => `\x1b[36m${str}\x1b[0m`;
-export const white = (str) => `\x1b[37m${str}\x1b[0m`;
-export const black = (str) => `\x1b[30m${str}\x1b[0m`;
-export const bgRed = (str) => `\x1b[41m${str}\x1b[0m`;
-export const bgGreen = (str) => `\x1b[42m${str}\x1b[0m`;
-export const bgYellow = (str) => `\x1b[43m${str}\x1b[0m`;
-export const bgBlue = (str) => `\x1b[44m${str}\x1b[0m`;
-export const bgMagenta = (str) => `\x1b[45m${str}\x1b[0m`;
-export const bgCyan = (str) => `\x1b[46m${str}\x1b[0m`;
-export const bgWhite = (str) => `\x1b[47m${str}\x1b[0m`;
-export const bgBlack = (str) => `\x1b[40m${str}\x1b[0m`;
-export const gray = (str) => `\x1b[90m${str}\x1b[0m`;
-export const lightGray = (str) => `\x1b[37m${str}\x1b[0m`;
-export const reset = (str) => `\x1b[0m${str}\x1b[0m`;

package/dna/scripts/functions/run-command.js

@@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright (c) dnaCopyrightHolder
- *
- * Use of this source code is governed by terms that can be
- * found in the LICENSE file in the root of this package.
- */
-
-import { execSync } from 'child_process';
-import { gray } from './colors.js';
-
-// Execute a shell command and return trimmed output
-// Execute a shell command and return trimmed output
-export function runCommand(command, silent = true, logCommand = true) {
-  if (logCommand) {
-    console.log(gray(`${command}`));
-  }
-  return execSync(command, {
-    encoding: 'utf-8',
-    stdio: silent ? ['pipe', 'pipe', 'pipe'] : undefined,
-  }).trim();
-}