@cyanheads/git-mcp-server 2.12.0 → 2.13.0

package/README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-[![Version](https://img.shields.io/badge/Version-2.12.0-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--11--25-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-11-25/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.29.0-green.svg?style=flat-square)](https://modelcontextprotocol.io/) [![License](https://img.shields.io/badge/License-Apache%202.0-orange.svg?style=flat-square)](./LICENSE) [![Status](https://img.shields.io/badge/Status-Stable-brightgreen.svg?style=flat-square)](https://github.com/cyanheads/git-mcp-server/issues) [![TypeScript](https://img.shields.io/badge/TypeScript-^6.0.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.3.11-blueviolet.svg?style=flat-square)](https://bun.sh/)
+[![Version](https://img.shields.io/badge/Version-2.13.0-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--11--25-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-11-25/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.29.0-green.svg?style=flat-square)](https://modelcontextprotocol.io/) [![License](https://img.shields.io/badge/License-Apache%202.0-orange.svg?style=flat-square)](./LICENSE) [![Status](https://img.shields.io/badge/Status-Stable-brightgreen.svg?style=flat-square)](https://github.com/cyanheads/git-mcp-server/issues) [![TypeScript](https://img.shields.io/badge/TypeScript-^6.0.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.3.11-blueviolet.svg?style=flat-square)](https://bun.sh/)
 
 </div>
 
@@ -83,20 +83,20 @@ For Streamable HTTP, set `MCP_TRANSPORT_TYPE=http` and `MCP_HTTP_PORT=3015`.
 
 Built on [`mcp-ts-template`](https://github.com/cyanheads/mcp-ts-template).
 
-| Feature                      | Details                                                                                                             |
-| :--------------------------- | :------------------------------------------------------------------------------------------------------------------ |
-| Declarative tools            | Define capabilities in single, self-contained files. The framework handles registration, validation, and execution. |
-| Error handling               | Unified `McpError` system for consistent, structured error responses.                                               |
-| Authentication               | Supports `none`, `jwt`, and `oauth` modes.                                                                          |
-| Pluggable storage            | Swap backends (`in-memory`, `filesystem`, `Supabase`, `Cloudflare KV/R2`) without changing business logic.          |
-| Observability                | Structured logging (Pino) and optional auto-instrumented OpenTelemetry for traces and metrics.                      |
-| Dependency injection         | Built with `tsyringe` for decoupled, testable architecture.                                                         |
-| Cross-runtime                | Auto-detects Bun or Node.js and uses the appropriate process spawning method.                                       |
-| Provider architecture        | Pluggable git provider system. Current: CLI. Planned: isomorphic-git for edge deployment.                           |
-| Working directory management | Session-specific directory context for multi-repo workflows.                                                        |
-| Configurable git identity    | Override author/committer info via environment variables, with fallback to global git config.                       |
-| Commit signing               | Optional GPG/SSH signing for commits, merges, rebases, cherry-picks, and tags.                                      |
-| Safety                       | Destructive operations (`git clean`, `git reset --hard`) require explicit confirmation flags.                       |
+| Feature                      | Details                                                                                                                                                                               |
+| :--------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Declarative tools            | Define capabilities in single, self-contained files. The framework handles registration, validation, and execution.                                                                   |
+| Error handling               | Unified `McpError` system for consistent, structured error responses.                                                                                                                 |
+| Authentication               | Supports `none`, `jwt`, and `oauth` modes.                                                                                                                                            |
+| Pluggable storage            | Swap backends (`in-memory`, `filesystem`, `Supabase`, `Cloudflare KV/R2`) without changing business logic.                                                                            |
+| Observability                | Structured logging (Pino) and optional auto-instrumented OpenTelemetry for traces and metrics.                                                                                        |
+| Dependency injection         | Built with `tsyringe` for decoupled, testable architecture.                                                                                                                           |
+| Cross-runtime                | Auto-detects Bun or Node.js and uses the appropriate process spawning method.                                                                                                         |
+| Provider architecture        | Pluggable git provider system. Current: CLI. Planned: isomorphic-git for edge deployment.                                                                                             |
+| Working directory management | Session-specific directory context for multi-repo workflows.                                                                                                                          |
+| Configurable git identity    | Override author/committer info via environment variables, with fallback to global git config.                                                                                         |
+| Commit signing               | GPG/SSH signing (enabled by default) for commits, merges, rebases, cherry-picks, and tags. Silent fallback to unsigned on failure with `signed`/`signingWarning` fields in responses. |
+| Safety                       | Destructive operations (`git clean`, `git reset --hard`) require explicit confirmation flags.                                                                                         |
 
 ## Security
 
@@ -111,26 +111,26 @@ Built on [`mcp-ts-template`](https://github.com/cyanheads/mcp-ts-template).
 
 All configuration is validated at startup in `src/config/index.ts`. Key environment variables:
 
-| Variable                       | Description                                                                                | Default     |
-| :----------------------------- | :----------------------------------------------------------------------------------------- | :---------- |
-| `MCP_TRANSPORT_TYPE`           | Transport: `stdio` or `http`.                                                              | `stdio`     |
-| `MCP_SESSION_MODE`             | HTTP session mode: `stateless`, `stateful`, or `auto`.                                     | `auto`      |
-| `MCP_RESPONSE_FORMAT`          | Response format: `json` (LLM-optimized), `markdown` (human-readable), or `auto`.           | `json`      |
-| `MCP_RESPONSE_VERBOSITY`       | Detail level: `minimal`, `standard`, or `full`.                                            | `standard`  |
-| `MCP_HTTP_PORT`                | HTTP server port.                                                                          | `3015`      |
-| `MCP_HTTP_HOST`                | HTTP server hostname.                                                                      | `127.0.0.1` |
-| `MCP_HTTP_ENDPOINT_PATH`       | MCP request endpoint path.                                                                 | `/mcp`      |
-| `MCP_AUTH_MODE`                | Authentication mode: `none`, `jwt`, or `oauth`.                                            | `none`      |
-| `STORAGE_PROVIDER_TYPE`        | Storage backend: `in-memory`, `filesystem`, `supabase`, `cloudflare-kv`, `r2`.             | `in-memory` |
-| `OTEL_ENABLED`                 | Enable OpenTelemetry.                                                                      | `false`     |
-| `MCP_LOG_LEVEL`                | Minimum log level: `debug`, `info`, `warn`, `error`.                                       | `info`      |
-| `GIT_SIGN_COMMITS`             | Enable GPG/SSH signing for commits, merges, rebases, cherry-picks, and tags.               | `false`     |
-| `GIT_AUTHOR_NAME`              | Git author name. Aliases: `GIT_USERNAME`, `GIT_USER`. Falls back to global git config.     | `(none)`    |
-| `GIT_AUTHOR_EMAIL`             | Git author email. Aliases: `GIT_EMAIL`, `GIT_USER_EMAIL`. Falls back to global git config. | `(none)`    |
-| `GIT_BASE_DIR`                 | Absolute path to restrict all git operations to a specific directory tree.                 | `(none)`    |
-| `GIT_WRAPUP_INSTRUCTIONS_PATH` | Path to custom markdown file with workflow instructions.                                   | `(none)`    |
-| `MCP_AUTH_SECRET_KEY`          | Required for `jwt` auth. 32+ character secret key.                                         | `(none)`    |
-| `OAUTH_ISSUER_URL`             | Required for `oauth` auth. OIDC provider URL.                                              | `(none)`    |
+| Variable                       | Description                                                                                                                                       | Default     |
+| :----------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------ | :---------- |
+| `MCP_TRANSPORT_TYPE`           | Transport: `stdio` or `http`.                                                                                                                     | `stdio`     |
+| `MCP_SESSION_MODE`             | HTTP session mode: `stateless`, `stateful`, or `auto`.                                                                                            | `auto`      |
+| `MCP_RESPONSE_FORMAT`          | Response format: `json` (LLM-optimized), `markdown` (human-readable), or `auto`.                                                                  | `json`      |
+| `MCP_RESPONSE_VERBOSITY`       | Detail level: `minimal`, `standard`, or `full`.                                                                                                   | `standard`  |
+| `MCP_HTTP_PORT`                | HTTP server port.                                                                                                                                 | `3015`      |
+| `MCP_HTTP_HOST`                | HTTP server hostname.                                                                                                                             | `127.0.0.1` |
+| `MCP_HTTP_ENDPOINT_PATH`       | MCP request endpoint path.                                                                                                                        | `/mcp`      |
+| `MCP_AUTH_MODE`                | Authentication mode: `none`, `jwt`, or `oauth`.                                                                                                   | `none`      |
+| `STORAGE_PROVIDER_TYPE`        | Storage backend: `in-memory`, `filesystem`, `supabase`, `cloudflare-kv`, `r2`.                                                                    | `in-memory` |
+| `OTEL_ENABLED`                 | Enable OpenTelemetry.                                                                                                                             | `false`     |
+| `MCP_LOG_LEVEL`                | Minimum log level: `debug`, `info`, `warn`, `error`.                                                                                              | `info`      |
+| `GIT_SIGN_COMMITS`             | GPG/SSH signing for commits, merges, rebases, cherry-picks, and tags. Falls back to unsigned on failure (see response `signed`/`signingWarning`). | `true`      |
+| `GIT_AUTHOR_NAME`              | Git author name. Aliases: `GIT_USERNAME`, `GIT_USER`. Falls back to global git config.                                                            | `(none)`    |
+| `GIT_AUTHOR_EMAIL`             | Git author email. Aliases: `GIT_EMAIL`, `GIT_USER_EMAIL`. Falls back to global git config.                                                        | `(none)`    |
+| `GIT_BASE_DIR`                 | Absolute path to restrict all git operations to a specific directory tree.                                                                        | `(none)`    |
+| `GIT_WRAPUP_INSTRUCTIONS_PATH` | Path to custom markdown file with workflow instructions.                                                                                          | `(none)`    |
+| `MCP_AUTH_SECRET_KEY`          | Required for `jwt` auth. 32+ character secret key.                                                                                                | `(none)`    |
+| `OAUTH_ISSUER_URL`             | Required for `oauth` auth. OIDC provider URL.                                                                                                     | `(none)`    |
 
 ## Running the server
 

package/dist/index.js

@@ -15284,7 +15284,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@cyanheads/git-mcp-server",
-    version: "2.12.0",
+    version: "2.13.0",
     mcpName: "io.github.cyanheads/git-mcp-server",
     description: "A secure and scalable Git MCP server enabling AI agents to perform comprehensive Git version control operations via STDIO and Streamable HTTP.",
     main: "dist/index.js",
@@ -15517,6 +15517,17 @@ var import_dotenv, packageManifest, emptyStringAsUndefined = (val) => {
     return;
   }
   return val;
+}, parseBoolEnv = (defaultValue) => (val) => {
+  if (typeof val === "boolean")
+    return val;
+  if (typeof val === "string") {
+    const lower = val.trim().toLowerCase();
+    if (["true", "1", "yes", "on"].includes(lower))
+      return true;
+    if (["false", "0", "no", "off", ""].includes(lower))
+      return false;
+  }
+  return defaultValue;
 }, expandTildePath = (path2) => {
   if (typeof path2 !== "string" || path2.trim() === "") {
     return;
@@ -15737,7 +15748,7 @@ var init_config = __esm(() => {
     }),
     git: exports_external.object({
       provider: exports_external.preprocess(emptyStringAsUndefined, exports_external.enum(["auto", "cli", "isomorphic"]).default("auto")),
-      signCommits: exports_external.coerce.boolean().default(false),
+      signCommits: exports_external.preprocess(parseBoolEnv(true), exports_external.boolean()),
       authorName: exports_external.string().regex(/^[^\n\r\0]*$/, "Git author name must not contain newlines or null bytes").optional(),
       authorEmail: exports_external.string().email().optional(),
       committerName: exports_external.string().regex(/^[^\n\r\0]*$/, "Git committer name must not contain newlines or null bytes").optional(),
@@ -133658,6 +133669,7 @@ async function listDirtyFiles(execGit, cwd, ctx) {
   return files;
 }
 // src/services/git/providers/cli/operations/commits/commit.ts
+init_utils();
 async function executeCommit(options, context, execGit) {
   try {
     if (options.filesToStage?.length) {
@@ -133677,8 +133689,10 @@ async function executeCommit(options, context, execGit) {
     if (options.noVerify) {
       args.push("--no-verify");
     }
-    const shouldSign = options.sign ?? shouldSignCommits();
-    if (shouldSign) {
+    const signRequested = shouldSignCommits();
+    let signed = false;
+    let signingWarning;
+    if (signRequested) {
       args.push("--gpg-sign");
     }
     if (options.author) {
@@ -133688,17 +133702,20 @@ async function executeCommit(options, context, execGit) {
     const cmd = buildGitCommand({ command: "commit", args });
     try {
       await execGit(cmd, context.workingDirectory, context.requestContext);
+      signed = signRequested;
     } catch (error48) {
-      if (shouldSign && options.forceUnsignedOnFailure) {
-        const unsignedArgs = args.filter((a) => a !== "--gpg-sign");
-        const unsignedCmd = buildGitCommand({
-          command: "commit",
-          args: unsignedArgs
-        });
-        await execGit(unsignedCmd, context.workingDirectory, context.requestContext);
-      } else {
+      if (!signRequested) {
         throw error48;
       }
+      const errorMessage = error48 instanceof Error ? error48.message : String(error48);
+      logger.warning("Commit signing failed; retrying unsigned. Set GIT_SIGN_COMMITS=false to suppress this attempt.", { ...context.requestContext, error: error48 });
+      signingWarning = `GIT_SIGN_COMMITS is enabled but signing failed; commit created unsigned. Check signing key availability (gpg-agent running, SSH key accessible). Underlying error: ${errorMessage}`;
+      const unsignedArgs = args.filter((a) => a !== "--gpg-sign");
+      const unsignedCmd = buildGitCommand({
+        command: "commit",
+        args: unsignedArgs
+      });
+      await execGit(unsignedCmd, context.workingDirectory, context.requestContext);
     }
     const hashCmd = buildGitCommand({
       command: "rev-parse",
@@ -133727,8 +133744,12 @@ async function executeCommit(options, context, execGit) {
       message: options.message,
       author: authorName,
       timestamp,
-      filesChanged
+      filesChanged,
+      signed
     };
+    if (signingWarning) {
+      result.signingWarning = signingWarning;
+    }
     return result;
   } catch (error48) {
     throw mapGitError(error48, "commit");
@@ -134185,8 +134206,7 @@ async function executeMerge(options, context, execGit) {
       if (options.message) {
         args.push("-m", options.message);
       }
-      const shouldSign = options.sign ?? shouldSignCommits();
-      if (shouldSign) {
+      if (shouldSignCommits()) {
         args.push("-S");
       }
       args.push(options.branch);
@@ -134283,8 +134303,7 @@ ${continueResult.stderr}`),
       if (options.preserve) {
         args.push("--preserve-merges");
       }
-      const shouldSign = options.sign ?? shouldSignCommits();
-      if (shouldSign) {
+      if (shouldSignCommits()) {
         args.push("--gpg-sign");
       }
       if (options.onto) {
@@ -134366,8 +134385,7 @@ async function executeCherryPick(options, context, execGit) {
       if (options.signoff) {
         args.push("--signoff");
       }
-      const shouldSign = options.sign ?? shouldSignCommits();
-      if (shouldSign) {
+      if (shouldSignCommits()) {
         args.push("--gpg-sign");
       }
       args.push(...options.commits);
@@ -134643,6 +134661,9 @@ async function executePull(options, context, execGit) {
     if (options.fastForwardOnly) {
       args.push("--ff-only");
     }
+    if (shouldSignCommits()) {
+      args.push("-S");
+    }
     const cmd = buildGitCommand({ command: "pull", args });
     const result = await execGit(cmd, context.workingDirectory, context.requestContext, { allowNonZeroExit: true });
     const hasConflicts = result.stdout.includes("CONFLICT") || result.stderr.includes("CONFLICT");
@@ -134697,6 +134718,7 @@ function parseFilesChanged(stdout) {
   return files;
 }
 // src/services/git/providers/cli/operations/tags/tag.ts
+init_utils();
 async function executeTag(options, context, execGit) {
   try {
     const args = [];
@@ -134738,7 +134760,9 @@ async function executeTag(options, context, execGit) {
         if (!options.tagName) {
           throw new Error("Tag name is required for create operation");
         }
-        const shouldSign = options.sign ?? shouldSignCommits();
+        const signRequested = shouldSignCommits();
+        let signed = false;
+        let signingWarning;
         const buildCreateArgs = (sign) => {
           const createArgs = [options.tagName];
           if (sign) {
@@ -134757,31 +134781,36 @@ async function executeTag(options, context, execGit) {
           }
           return createArgs;
         };
-        const configOverride = shouldSign ? [] : ["-c", "tag.gpgSign=false"];
-        const createCmd = [
-          ...configOverride,
-          ...buildGitCommand({
-            command: "tag",
-            args: buildCreateArgs(shouldSign)
-          })
-        ];
+        const buildCmd = (sign) => {
+          const configOverride = sign ? [] : ["-c", "tag.gpgSign=false"];
+          return [
+            ...configOverride,
+            ...buildGitCommand({
+              command: "tag",
+              args: buildCreateArgs(sign)
+            })
+          ];
+        };
         try {
-          await execGit(createCmd, context.workingDirectory, context.requestContext);
+          await execGit(buildCmd(signRequested), context.workingDirectory, context.requestContext);
+          signed = signRequested;
         } catch (error48) {
-          if (shouldSign && options.forceUnsignedOnFailure) {
-            const unsignedCmd = buildGitCommand({
-              command: "tag",
-              args: buildCreateArgs(false)
-            });
-            await execGit(unsignedCmd, context.workingDirectory, context.requestContext);
-          } else {
+          if (!signRequested) {
             throw error48;
           }
+          const errorMessage = error48 instanceof Error ? error48.message : String(error48);
+          logger.warning("Tag signing failed; retrying unsigned. Set GIT_SIGN_COMMITS=false to suppress this attempt.", { ...context.requestContext, error: error48 });
+          signingWarning = `GIT_SIGN_COMMITS is enabled but signing failed; tag created unsigned. Check signing key availability (gpg-agent running, SSH key accessible). Underlying error: ${errorMessage}`;
+          await execGit(buildCmd(false), context.workingDirectory, context.requestContext);
         }
         const createResult = {
           mode: "create",
-          created: options.tagName
+          created: options.tagName,
+          signed
         };
+        if (signingWarning) {
+          createResult.signingWarning = signingWarning;
+        }
         return createResult;
       }
       case "delete": {
@@ -145251,12 +145280,10 @@ var import_tsyringe7 = __toESM(require_cjs2(), 1);
 // src/mcp-server/prompts/definitions/git-wrapup.prompt.ts
 init_zod();
 var PROMPT_NAME = "git_wrapup";
-var PROMPT_DESCRIPTION = "Generates a structured workflow prompt for wrapping up git sessions, including reviewing changes, updating documentation, and committing modifications.";
+var PROMPT_DESCRIPTION = "Orchestrates a full git wrap-up: loads the project-aware acceptance-criteria protocol from git_wrapup_instructions, analyzes changes, satisfies each criterion per project convention, commits atomically, and (optionally) tags the release.";
 var ArgumentsSchema = exports_external.object({
-  changelogPath: exports_external.string().optional().describe("Path to the changelog file to update (defaults to CHANGELOG.md)."),
-  skipDocumentation: exports_external.string().optional().describe("Whether to skip documentation review ('true' | 'false'). Defaults to 'false'."),
-  createTag: exports_external.string().optional().describe("Whether to create a git tag after committing ('true' | 'false'). Defaults to 'false'."),
-  updateAgentFiles: exports_external.string().optional().describe("Whether to update agent meta files like CLAUDE.md, AGENTS.md ('true' | 'false'). Defaults to 'false'.")
+  changelogPath: exports_external.string().optional().describe("Path to the changelog file when the project uses a flat one (defaults to CHANGELOG.md). The protocol itself defers to project convention."),
+  createTag: exports_external.string().optional().describe("Whether to include the tag criterion in the protocol ('true' | 'false'). Defaults to 'true' — set to 'false' when tagging is deferred to a separate release step.")
 });
 var gitWrapupPrompt = {
   name: PROMPT_NAME,
@@ -145264,57 +145291,34 @@ var gitWrapupPrompt = {
   argumentsSchema: ArgumentsSchema,
   generate: (args) => {
     const changelogPath = args.changelogPath || "CHANGELOG.md";
-    const skipDocumentation = args.skipDocumentation === "true";
-    const createTag = args.createTag === "true";
-    const updateAgentFiles = args.updateAgentFiles === "true";
-    const documentationSection = skipDocumentation ? "" : `
-4. **Review Documentation**: Read the README.md file and verify it accurately reflects the current codebase state. Update as necessary to maintain currency and accuracy.
-`;
-    const agentFilesSection = updateAgentFiles ? `
-5. **Update Agent Files**: If present, review and update agent-specific meta files (CLAUDE.md, AGENTS.md, .clinerules/) to reflect any architectural or protocol changes.
-` : "";
-    const tagSection = createTag ? `
-After all commits are complete and verified via git_status, create an annotated git tag using the git_tag tool. Use semantic versioning (e.g., v1.2.3) and include a summary of key changes in the annotation message.
-` : "";
+    const includeTag = args.createTag !== "false";
     return [
       {
         role: "user",
         content: {
           type: "text",
-          text: `You are an expert git workflow manager. Execute a systematic wrap-up protocol for the current git session.
+          text: `You are an expert git workflow manager. Run a complete wrap-up for the current git session.
 
-## Workflow Protocol
+## Session Flow
 
-Follow these steps in order. Do not proceed until the prior step is confirmed complete.
+1. **Load Protocol**: Call \`git_wrapup_instructions\` with \`acknowledgement: "yes"\`${includeTag ? "" : " and `createTag: false`"}. It returns an acceptance-criteria checklist — every box must be satisfied before the wrap-up is complete — plus the current repository status.
 
-1. **Initialize Context**: First, call the \`git_wrapup_instructions\` tool with \`acknowledgement: "yes"\`${updateAgentFiles ? ' and `updateAgentMetaFiles: "yes"`' : ""}${createTag ? " and `createTag: true`" : ""}. This will provide the detailed workflow instructions and current repository status.
+2. **Set Working Directory**: If not already set, call \`git_set_working_dir\` to establish the session context. Required before any git operations.
 
-2. **Set Working Directory**: If not already set, use \`git_set_working_dir\` to establish the session context. This is mandatory before any git operations.
+3. **Analyze Changes**: Run \`git_diff\` with \`includeUntracked: true\`. Understand the "why" behind every modification end-to-end before grouping anything — the diff drives your commit plan and messages.
 
-3. **Analyze Changes**: Execute \`git_diff\` with \`includeUntracked: true\` to comprehensively understand all modifications. Analyze the diff output thoroughly to inform your commit strategy and messages.
+4. **Satisfy the Acceptance Criteria**: Work each checkbox from step 1. The protocol is strict on outcomes, generic on mechanism — follow this project's own conventions for where versions live, how the changelog is formatted (default path when flat: \`${changelogPath}\`), and what the verification suite looks like. If the root agent-instruction file (\`AGENTS.md\`, \`CLAUDE.md\`, or equivalent) documents a project-specific wrap-up procedure, that takes precedence over the generic checklist.
 
-4. **Update Changelog**: Read the existing \`${changelogPath}\` file. Append a new version entry at the top that:
-   - Uses past tense and concise language
-   - Categorizes changes (Added, Changed, Fixed, Deprecated, Removed, Security)
-   - Follows the existing changelog format
-   - Provides enough detail for users to understand the impact
-${documentationSection}${agentFilesSection}
-5. **Commit Changes**: Use \`git_commit\` to create atomic, logical commits. For each commit:
-   - Group related changes together using the \`filesToStage\` parameter
-   - Write commit messages following Conventional Commits format (e.g., \`feat(auth): add password reset\`, \`fix(parser): handle edge case\`)
-   - Ensure commits are self-contained and buildable
-   - Do not mix unrelated changes in a single commit
+5. **Commit Atomically**: Use \`git_commit\` to create logical, self-contained commits in Conventional Commits form. Group related changes with the \`filesToStage\` parameter. No mixing unrelated changes in one commit.
 
-6. **Verify Completion**: After all commits, run \`git_status\` to confirm the working directory is clean and all changes are committed.
-${tagSection}
-## Important Guidelines
+6. **Verify Clean**: Run \`git_status\` to confirm the working tree is clean and every change is committed.${includeTag ? "\n\n7. **Tag the Release**: Create an annotated git tag with `git_tag` using semantic versioning (e.g., `v1.2.3`). The annotation message should summarize the real changes — no filler." : ""}
 
-- **Do NOT push** to the remote repository unless explicitly instructed
-- Create a task list before starting to track your progress
-- Be thorough in your diff analysis - understand the "why" behind changes
-- If you encounter merge conflicts or errors, stop and ask for guidance
-- All commit messages must be clear, descriptive, and follow conventions
-- Preserve existing code style and documentation formatting
+## Constraints
+
+- **Do not push** to the remote unless explicitly instructed.
+- Create a task list before starting so progress is trackable.
+- Do not bypass verification failures to land a green commit.
+- On merge conflicts or unexpected errors: stop and surface the blocker.
 
 Begin by calling \`git_wrapup_instructions\` and creating your task list.`
         }
@@ -145403,7 +145407,6 @@ var AllSchema = exports_external.boolean().default(false).describe("Include all
 var MergeStrategySchema = exports_external.enum(["ort", "recursive", "octopus", "ours", "subtree"]).optional().describe("Merge strategy to use (ort, recursive, octopus, ours, subtree).");
 var PruneSchema = exports_external.boolean().default(false).describe("Prune remote-tracking references that no longer exist on remote.");
 var DepthSchema = exports_external.number().int().min(1).optional().describe("Create a shallow clone with history truncated to N commits.");
-var SignSchema = exports_external.boolean().optional().describe("Sign the commit/tag with GPG/SSH. Omit to use the server's GIT_SIGN_COMMITS default (recommended). Set true to force signing, or false to skip signing even when the default enables it.");
 var NoVerifySchema = exports_external.boolean().default(false).describe("Bypass pre-commit and commit-msg hooks.");
 
 // src/mcp-server/tools/utils/json-response-formatter.ts
@@ -146841,10 +146844,8 @@ var InputSchema12 = exports_external.object({
   }).optional().describe("Override commit author (defaults to git config)."),
   amend: exports_external.boolean().default(false).describe("Amend the previous commit instead of creating a new one. Use with caution."),
   allowEmpty: exports_external.boolean().default(false).describe("Allow creating a commit with no changes."),
-  sign: SignSchema,
   noVerify: NoVerifySchema,
-  filesToStage: exports_external.array(exports_external.string()).optional().describe("File paths to stage before committing (atomic stage+commit operation)."),
-  forceUnsignedOnFailure: exports_external.boolean().default(false).describe("If GPG/SSH signing fails, retry the commit without signing instead of failing.")
+  filesToStage: exports_external.array(exports_external.string()).optional().describe("File paths to stage before committing (atomic stage+commit operation).")
 });
 var OutputSchema13 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),
@@ -146856,6 +146857,8 @@ var OutputSchema13 = exports_external.object({
   committedFiles: exports_external.array(exports_external.string()).describe("List of files that were committed."),
   insertions: exports_external.number().int().optional().describe("Number of line insertions."),
   deletions: exports_external.number().int().optional().describe("Number of line deletions."),
+  signed: exports_external.boolean().describe("Whether the commit was signed. False when GIT_SIGN_COMMITS=false or when signing was attempted and fell back to unsigned on failure."),
+  signingWarning: exports_external.string().optional().describe("Populated only when signing was requested but failed, and the commit was created unsigned as a fallback."),
   status: exports_external.object({
     current_branch: exports_external.string().nullable().describe("Current branch name after commit."),
     staged_changes: exports_external.record(exports_external.string(), exports_external.any()).describe("Remaining staged changes after commit."),
@@ -146877,15 +146880,11 @@ async function gitCommitLogic(input, { provider, targetPath, appContext }) {
     message: input.message,
     amend: input.amend,
     allowEmpty: input.allowEmpty,
-    noVerify: input.noVerify,
-    forceUnsignedOnFailure: input.forceUnsignedOnFailure
+    noVerify: input.noVerify
   };
   if (input.author !== undefined) {
     commitOptions.author = input.author;
   }
-  if (input.sign !== undefined) {
-    commitOptions.sign = input.sign;
-  }
   const result = await provider.commit(commitOptions, {
     workingDirectory: targetPath,
     requestContext: appContext,
@@ -146896,7 +146895,7 @@ async function gitCommitLogic(input, { provider, targetPath, appContext }) {
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"
   });
-  return {
+  const output = {
     success: result.success,
     commitHash: result.commitHash,
     message: result.message,
@@ -146904,6 +146903,7 @@ async function gitCommitLogic(input, { provider, targetPath, appContext }) {
     timestamp: result.timestamp,
     filesChanged: result.filesChanged.length,
     committedFiles: result.filesChanged,
+    signed: result.signed,
     status: {
       current_branch: statusResult.currentBranch,
       staged_changes: flattenChanges(statusResult.stagedChanges),
@@ -146913,6 +146913,10 @@ async function gitCommitLogic(input, { provider, targetPath, appContext }) {
       is_clean: statusResult.isClean
     }
   };
+  if (result.signingWarning) {
+    output.signingWarning = result.signingWarning;
+  }
+  return output;
 }
 function filterGitCommitOutput(result, level) {
   if (level === "minimal") {
@@ -146920,6 +146924,8 @@ function filterGitCommitOutput(result, level) {
       success: result.success,
       commitHash: result.commitHash,
       message: result.message,
+      signed: result.signed,
+      ...result.signingWarning && { signingWarning: result.signingWarning },
       status: {
         current_branch: result.status.current_branch,
         is_clean: result.status.is_clean,
@@ -146941,6 +146947,8 @@ function filterGitCommitOutput(result, level) {
       insertions: result.insertions,
       deletions: result.deletions,
       committedFiles: result.committedFiles,
+      signed: result.signed,
+      ...result.signingWarning && { signingWarning: result.signingWarning },
       status: {
         current_branch: result.status.current_branch,
         is_clean: result.status.is_clean,
@@ -148189,9 +148197,7 @@ var InputSchema27 = exports_external.object({
   tagName: TagNameSchema.optional().describe("Tag name for create/delete operations."),
   commit: CommitRefSchema.optional().describe("Commit to tag (default: HEAD for create operation)."),
   message: exports_external.string().optional().describe("Tag message. Providing a message always produces an annotated tag (git does not support messages on lightweight tags). For release tags, summarize notable changes."),
-  annotated: exports_external.boolean().default(false).describe('Create an annotated tag with a default "Tag <name>" message. Only effective when both message and sign are absent — otherwise the tag is always annotated.'),
-  sign: SignSchema,
-  forceUnsignedOnFailure: exports_external.boolean().default(false).describe("If GPG/SSH signing fails, retry the tag creation without signing instead of failing."),
+  annotated: exports_external.boolean().default(false).describe('Create an annotated tag with a default "Tag <name>" message. Only effective when no message is provided and signing is disabled — otherwise the tag is always annotated.'),
   force: ForceSchema.describe("Overwrite an existing tag (create mode only; has no effect on list or delete).")
 });
 var TagInfoSchema = exports_external.object({
@@ -148206,7 +148212,9 @@ var OutputSchema28 = exports_external.object({
   mode: exports_external.string().describe("Operation mode that was performed."),
   tags: exports_external.array(TagInfoSchema).optional().describe("List of tags (for list mode)."),
   created: exports_external.string().optional().describe("Created tag name (for create mode)."),
-  deleted: exports_external.string().optional().describe("Deleted tag name (for delete mode).")
+  deleted: exports_external.string().optional().describe("Deleted tag name (for delete mode)."),
+  signed: exports_external.boolean().optional().describe("Whether the created tag was signed. Only populated for create mode. False when GIT_SIGN_COMMITS=false or when signing failed and fell back to unsigned."),
+  signingWarning: exports_external.string().optional().describe("Populated only when signing was requested but failed, and the tag was created unsigned as a fallback.")
 });
 async function gitTagLogic(input, { provider, targetPath, appContext }) {
   if ((input.mode === "create" || input.mode === "delete") && !input.tagName) {
@@ -148215,8 +148223,7 @@ async function gitTagLogic(input, { provider, targetPath, appContext }) {
   const tagOptions = {
     mode: input.mode,
     annotated: input.annotated,
-    force: input.force,
-    forceUnsignedOnFailure: input.forceUnsignedOnFailure
+    force: input.force
   };
   if (input.tagName !== undefined) {
     tagOptions.tagName = input.tagName;
@@ -148227,27 +148234,33 @@ async function gitTagLogic(input, { provider, targetPath, appContext }) {
   if (input.message !== undefined) {
     tagOptions.message = normalizeMessage(input.message);
   }
-  if (input.sign !== undefined) {
-    tagOptions.sign = input.sign;
-  }
   const result = await provider.tag(tagOptions, {
     workingDirectory: targetPath,
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"
   });
-  return {
+  const output = {
     success: true,
     mode: result.mode,
     tags: result.tags,
     created: result.created,
     deleted: result.deleted
   };
+  if (result.signed !== undefined) {
+    output.signed = result.signed;
+  }
+  if (result.signingWarning) {
+    output.signingWarning = result.signingWarning;
+  }
+  return output;
 }
 function filterGitTagOutput(result, level) {
   if (level === "minimal") {
     return {
       success: result.success,
-      mode: result.mode
+      mode: result.mode,
+      ...result.signed !== undefined && { signed: result.signed },
+      ...result.signingWarning && { signingWarning: result.signingWarning }
     };
   }
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyanheads/git-mcp-server",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "mcpName": "io.github.cyanheads/git-mcp-server",
   "description": "A secure and scalable Git MCP server enabling AI agents to perform comprehensive Git version control operations via STDIO and Streamable HTTP.",
   "main": "dist/index.js",