Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Reclassify hook skip message from hint to info

Maximilian Roos0c0dd9376883
diff --git a/CLAUDE.md b/CLAUDE.md
index 2599d4c3b..3eb9a5b4c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -195,10 +195,18 @@ Seven canonical message patterns with their emojis:
2. **Success**: ✅ (successful completion)
3. **Errors**: ❌ (failures, invalid states)
4. **Warnings**: 🟡 (non-blocking issues)
-5. **Hints**: 💡 (actionable suggestions, tips for user)
-6. **Info**: ⚪ (neutral status, system feedback, metadata)
+5. **Hints**: 💡 (actionable — user could/should do something)
+6. **Info**: ⚪ (status — acknowledging state or user choices, no action needed)
7. **Prompts**: ❓ (questions requiring user input)
+**Hint vs Info decision:** If the message suggests the user take an action, it's a hint. If it's acknowledging what happened (including flag effects), it's info.
+
+| Hint 💡 | Info ⚪ |
+|---------|---------|
+| "Run `wt merge` to continue" | "Already up to date with main" |
+| "Use `--force` to override" | "Skipping hooks (--no-verify)" |
+| "Branch can be deleted" | "Worktree preserved (main worktree)" |
+
**Message formatting functions** add emoji AND semantic color. Callers provide content with optional inner styling (like `<bold>`), then pass to `output::print()`:
```rust
diff --git a/src/commands/commit.rs b/src/commands/commit.rs
index b133b03a7..5f62a4f8d 100644
--- a/src/commands/commit.rs
+++ b/src/commands/commit.rs
@@ -3,7 +3,9 @@ use color_print::cformat;
use worktrunk::HookType;
use worktrunk::config::CommitGenerationConfig;
use worktrunk::git::Repository;
-use worktrunk::styling::{format_with_gutter, hint_message, progress_message, success_message};
+use worktrunk::styling::{
+ format_with_gutter, hint_message, info_message, progress_message, success_message,
+};
use super::command_executor::CommandContext;
use super::hooks::{HookFailureStrategy, HookPipeline, HookSource};
@@ -152,7 +154,7 @@ impl CommitOptions<'_> {
// Show skip message
if self.no_verify && any_hooks_exist {
- crate::output::print(hint_message(cformat!(
+ crate::output::print(info_message(cformat!(
"Skipping pre-commit hooks (<bright-black>--no-verify</>)"
)))?;
}
diff --git a/src/commands/standalone.rs b/src/commands/standalone.rs
index 842fee260..cacb8e405 100644
--- a/src/commands/standalone.rs
+++ b/src/commands/standalone.rs
@@ -292,7 +292,7 @@ pub fn handle_squash(
let has_any_pre_commit = has_project_pre_commit || has_user_pre_commit;
if skip_pre_commit && has_any_pre_commit {
- crate::output::print(hint_message(cformat!(
+ crate::output::print(info_message(cformat!(
"Skipping pre-commit hooks (<bright-black>--no-verify</>)"
)))?;
}
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
index 98b3675d6..269a013a9 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-💡 Skipping pre-commit hooks (--no-verify)
+⚪ Skipping pre-commit hooks (--no-verify)
🔄 Generating commit message and committing tracked changes... (1 file, +1, -1)
  fix: update file
✅ Committed changes @ 0b66aac
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
index abd2da770..4fc357823 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-💡 Skipping pre-commit hooks (--no-verify)
+⚪ Skipping pre-commit hooks (--no-verify)
🟡 Auto-staging 2 untracked paths:
  .config/
  file1.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
index 57824ede6..7f034b555 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-💡 Skipping pre-commit hooks (--no-verify)
+⚪ Skipping pre-commit hooks (--no-verify)
🔄 Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
💡 Backup created @ 31e06e8
🔄 Generating squash commit message...
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
index df2d7d2d9..fa00cb1b5 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-💡 Skipping pre-commit hooks (--no-verify)
+⚪ Skipping pre-commit hooks (--no-verify)
🔄 Squashing 2 commits into a single commit (3 files, +3)...
🔄 Generating squash commit message...
  squash: combined commits