nikon/Codesys-MCP-SP21-plus
0
0
Fork 0
Code Activity Actions

fix(release_project_version): preserve real newlines in tag body via -F tempfile

Browse source 
The dual-SHA tracking commit (146d950) wrote the tag annotation with
`git tag -a -m JSON.stringify(body)`. JSON.stringify escapes newlines
as the literal two-char sequence "\n", and the shell passes those
through unchanged -- so git stored the body as one big line with
literal "\n" chars instead of real LF bytes.

The reader (readTagShas) used a multiline regex anchored on `^` and
`$`, which doesn't match across literal "\n" -- so v1.3.2.0's tag was
written with SHAs in the body but they're invisible to the next
release's read-back.

Two fixes:
  - Reader (readTagShas): normalise literal "\n" sequences to real
    newlines before applying the regex. Backward-compatible -- handles
    the v1.3.2.0 tag transparently and works on properly-formed tags
    from v1.3.3.0 onward too.
  - Writer (release_project_version step 8): write the body to a
    temp file and use `git tag -F <tempfile> --cleanup=verbatim` so
    real LF bytes go in. Also adds os import for os.tmpdir().

Verified locally: dist/server.js loads cleanly. End-to-end behaviour
confirmable on the next release_project_version call against any
project.
This commit is contained in:
Karstein Kvistad 2026-04-26 18:14:33 +02:00
parent 146d950e17
commit 26260ac43d
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/server.ts
View file

@ -5,6 +5,7 @@
import * as path from 'path';
import * as fs from 'fs';
import * as os from 'os';
import * as crypto from 'crypto';
import { execSync } from 'child_process';
import { McpServer, ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
@ -208,8 +209,17 @@ function readTagShas(projectDir: string, tagName: string): { project?: string; m
} catch {
return {};
}
const projMatch = body.match(/^project-sha256:\s*([0-9a-f]{64})\s*$/m);
const mirMatch = body.match(/^mirror-sha256:\s*([0-9a-f]{64})\s*$/m);
// Some early SHA-tracking tags (v1.3.2.0 onward) were written via
// `git tag -m` with JSON.stringify(body) which escaped newlines as
// literal "\n" two-char sequences instead of real LF bytes -- the
// regex below requires real line starts (multiline mode), so handle
// both forms by normalising the literal sequence to a real newline
// before matching. Future tags written via `git tag -F <tempfile>`
// preserve real newlines and need no normalisation; this fallback
// is just for backward compatibility with the early tags.
const normalized = body.replace(/\\n/g, '\n');
const projMatch = normalized.match(/^project-sha256:\s*([0-9a-f]{64})\s*$/m);
const mirMatch = normalized.match(/^mirror-sha256:\s*([0-9a-f]{64})\s*$/m);
return {
project: projMatch ? projMatch[1] : undefined,
mirror: mirMatch ? mirMatch[1] : undefined,
@ -2188,7 +2198,17 @@ export async function startMcpServer(config: ServerConfig): Promise<void> {
`v${newVersion} (${levelLabel})\n\n` +
`project-sha256: ${newProjectSha}\n` +
`mirror-sha256: ${newMirrorSha}\n`;
execSync(`git -C "${projectDir}" tag -a v${newVersion} -m ${JSON.stringify(tagBody)}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
// Write the tag body via -F <tempfile> so real LF newlines are
// preserved verbatim. Earlier versions used `-m JSON.stringify(body)`
// which the shell passed through with literal "\n" sequences,
// breaking the multiline regex in readTagShas() on the read side.
const tagBodyFile = path.join(os.tmpdir(), `codesys-mcp-tagbody-${Date.now()}-${Math.random().toString(36).slice(2, 9)}.txt`);
fs.writeFileSync(tagBodyFile, tagBody, 'utf-8');
try {
execSync(`git -C "${projectDir}" tag -a v${newVersion} -F "${tagBodyFile}" --cleanup=verbatim`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
} finally {
try { fs.unlinkSync(tagBodyFile); } catch { /* best-effort cleanup */ }
}
log.push(`git: committed + tagged v${newVersion} (project-sha256: ${newProjectSha.slice(0, 12)}..., mirror-sha256: ${newMirrorSha.slice(0, 12)}...)`);
if (doPush) {