oh-my-codex 0.13.0 → 0.13.2

package/dist/scripts/generate-release-body.js

@@ -0,0 +1,249 @@
+#!/usr/bin/env node
+import { readFileSync, writeFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { pathToFileURL } from 'node:url';
+function usage() {
+    console.error('Usage: node scripts/generate-release-body.mjs --template <path> --out <path> [--current-tag <tag>] [--previous-tag <tag>] [--repo <owner/name>]');
+    process.exit(1);
+}
+function arg(name) {
+    const index = process.argv.indexOf(name);
+    if (index === -1)
+        return undefined;
+    return process.argv[index + 1];
+}
+function runGit(args, cwd, allowFailure = false) {
+    const result = spawnSync('git', args, {
+        cwd,
+        encoding: 'utf-8',
+        stdio: 'pipe',
+    });
+    if (result.status !== 0) {
+        if (allowFailure)
+            return '';
+        throw new Error(`git ${args.join(' ')} failed: ${(result.stderr || result.stdout || '').trim()}`.trim());
+    }
+    return String(result.stdout || '').trim();
+}
+function resolveRepositoryFromRemote(cwd) {
+    const remote = runGit(['config', '--get', 'remote.origin.url'], cwd, true);
+    if (!remote)
+        return undefined;
+    const httpsMatch = remote.match(/github\.com[:/](.+?)(?:\.git)?$/);
+    return httpsMatch?.[1];
+}
+export function resolveCurrentTag(cwd, explicit) {
+    if (explicit)
+        return explicit;
+    if (process.env.GITHUB_REF_NAME)
+        return process.env.GITHUB_REF_NAME;
+    const described = runGit(['describe', '--tags', '--exact-match'], cwd, true);
+    if (described)
+        return described;
+    throw new Error('unable to determine current release tag; pass --current-tag or set GITHUB_REF_NAME');
+}
+export function resolvePreviousTag(cwd, currentTag, explicit) {
+    if (explicit)
+        return explicit;
+    const tags = runGit(['tag', '--list', 'v*', '--sort=-v:refname'], cwd, true)
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter(Boolean);
+    if (tags.length === 0)
+        return undefined;
+    const currentIndex = tags.indexOf(currentTag);
+    if (currentIndex >= 0)
+        return tags.slice(currentIndex + 1).find(Boolean);
+    return tags.find((tag) => tag !== currentTag);
+}
+function normalizeContributors(contributors) {
+    const deduped = new Map();
+    for (const contributor of contributors) {
+        const login = contributor.login?.trim();
+        const displayName = contributor.displayName.trim();
+        if (!displayName && !login)
+            continue;
+        const key = (login || displayName).toLowerCase();
+        if (!deduped.has(key)) {
+            deduped.set(key, {
+                displayName: displayName || `@${login}`,
+                ...(login ? { login } : {}),
+                ...(contributor.url ? { url: contributor.url } : {}),
+            });
+        }
+    }
+    return [...deduped.values()].sort((left, right) => {
+        const leftKey = (left.login || left.displayName).toLowerCase();
+        const rightKey = (right.login || right.displayName).toLowerCase();
+        return leftKey.localeCompare(rightKey);
+    });
+}
+export function formatContributor(contributor) {
+    if (contributor.login && contributor.url) {
+        return `[@${contributor.login}](${contributor.url})`;
+    }
+    if (contributor.login) {
+        return `@${contributor.login}`;
+    }
+    if (contributor.url) {
+        return `[${contributor.displayName}](${contributor.url})`;
+    }
+    return contributor.displayName;
+}
+function joinHumanList(values) {
+    if (values.length === 0)
+        return 'the contributors';
+    if (values.length === 1)
+        return values[0];
+    if (values.length === 2)
+        return `${values[0]} and ${values[1]}`;
+    return `${values.slice(0, -1).join(', ')}, and ${values.at(-1)}`;
+}
+export function renderContributorsSection(contributors) {
+    const normalized = normalizeContributors(contributors);
+    if (normalized.length === 0) {
+        return 'Thanks to the contributors who made this release possible.';
+    }
+    return `Thanks to ${joinHumanList(normalized.map((contributor) => formatContributor(contributor)))} for contributing to this release.`;
+}
+export function buildFullChangelogLine(repo, currentTag, previousTag) {
+    if (!repo) {
+        throw new Error('unable to determine GitHub repository; pass --repo or set GITHUB_REPOSITORY');
+    }
+    if (previousTag) {
+        return `**Full Changelog**: [\`${previousTag}...${currentTag}\`](https://github.com/${repo}/compare/${previousTag}...${currentTag})`;
+    }
+    return `**Full Changelog**: [\`${currentTag}\`](https://github.com/${repo}/releases/tag/${currentTag})`;
+}
+function replaceTitle(markdown, currentTag) {
+    if (!/^#\s+/m.test(markdown)) {
+        throw new Error('release body template is missing a top-level title');
+    }
+    return markdown.replace(/^#\s+.*$/m, `# oh-my-codex ${currentTag}`);
+}
+function findSectionEnd(lines, startIndex) {
+    for (let index = startIndex + 1; index < lines.length; index += 1) {
+        if (/^##\s+/.test(lines[index] ?? ''))
+            return index;
+        if (/^\*\*Full Changelog\*\*:/.test(lines[index] ?? ''))
+            return index;
+    }
+    return lines.length;
+}
+export function replaceSectionBody(markdown, heading, body) {
+    const lines = markdown.split(/\r?\n/);
+    const headingLine = `## ${heading}`;
+    const startIndex = lines.findIndex((line) => line.trim() === headingLine);
+    if (startIndex === -1) {
+        throw new Error(`release body template is missing section: ${headingLine}`);
+    }
+    const endIndex = findSectionEnd(lines, startIndex);
+    lines.splice(startIndex + 1, endIndex - startIndex - 1, '', ...body.split('\n'), '');
+    return `${lines.join('\n').replace(/\n{3,}/g, '\n\n').trimEnd()}\n`;
+}
+export function replaceFullChangelogLine(markdown, fullChangelogLine) {
+    const lines = markdown.split(/\r?\n/);
+    const lineIndex = lines.findIndex((line) => /^\*\*Full Changelog\*\*:/.test(line));
+    if (lineIndex === -1) {
+        throw new Error('release body template is missing the Full Changelog line');
+    }
+    lines[lineIndex] = fullChangelogLine;
+    return `${lines.join('\n').trimEnd()}\n`;
+}
+function parseShortlogLine(line) {
+    const match = line.match(/^\s*\d+\s+(.+?)(?:\s+<[^>]+>)?$/);
+    if (!match)
+        return undefined;
+    const displayName = match[1]?.trim();
+    if (!displayName)
+        return undefined;
+    return { displayName };
+}
+export function getGitContributors(cwd, currentTag, previousTag) {
+    const range = previousTag ? `${previousTag}..${currentTag}` : currentTag;
+    const shortlog = runGit(['shortlog', '-sne', range], cwd, true);
+    if (!shortlog)
+        return [];
+    return normalizeContributors(shortlog.split(/\r?\n/).map((line) => parseShortlogLine(line)).filter((value) => Boolean(value)));
+}
+export async function getGitHubCompareContributors(repo, currentTag, previousTag, githubToken, fetchImpl = fetch) {
+    const response = await fetchImpl(`https://api.github.com/repos/${repo}/compare/${previousTag}...${currentTag}`, {
+        headers: {
+            Accept: 'application/vnd.github+json',
+            Authorization: `Bearer ${githubToken}`,
+            'User-Agent': 'oh-my-codex-release-body-generator',
+            'X-GitHub-Api-Version': '2022-11-28',
+        },
+    });
+    if (!response.ok) {
+        throw new Error(`GitHub compare API failed (${response.status})`);
+    }
+    const payload = await response.json();
+    const contributors = (payload.commits ?? []).map((commit) => {
+        if (commit.author?.login) {
+            return {
+                displayName: `@${commit.author.login}`,
+                login: commit.author.login,
+                ...(commit.author.html_url ? { url: commit.author.html_url } : {}),
+            };
+        }
+        const name = commit.commit?.author?.name?.trim();
+        return name ? { displayName: name } : undefined;
+    }).filter((value) => Boolean(value));
+    return normalizeContributors(contributors);
+}
+export async function resolveContributors(options) {
+    const { cwd, repo, currentTag, previousTag, githubToken } = options;
+    if (repo && previousTag && githubToken) {
+        try {
+            return await getGitHubCompareContributors(repo, currentTag, previousTag, githubToken);
+        }
+        catch (error) {
+            console.error(`[generate-release-body] falling back to git shortlog: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    return getGitContributors(cwd, currentTag, previousTag);
+}
+export async function generateReleaseBody(options) {
+    const cwd = resolve(options.cwd ?? process.cwd());
+    const templatePath = resolve(cwd, options.templatePath);
+    const outPath = resolve(cwd, options.outPath);
+    const currentTag = resolveCurrentTag(cwd, options.currentTag);
+    const previousTag = resolvePreviousTag(cwd, currentTag, options.previousTag);
+    const repo = options.repo || process.env.GITHUB_REPOSITORY || resolveRepositoryFromRemote(cwd);
+    const contributors = await resolveContributors({
+        cwd,
+        repo,
+        currentTag,
+        previousTag,
+        githubToken: options.githubToken || process.env.GITHUB_TOKEN,
+    });
+    let markdown = readFileSync(templatePath, 'utf-8');
+    markdown = replaceTitle(markdown, currentTag);
+    markdown = replaceSectionBody(markdown, 'Contributors', renderContributorsSection(contributors));
+    markdown = replaceFullChangelogLine(markdown, buildFullChangelogLine(repo || '', currentTag, previousTag));
+    writeFileSync(outPath, markdown);
+    return markdown;
+}
+async function main() {
+    const templatePath = arg('--template');
+    const outPath = arg('--out');
+    if (!templatePath || !outPath)
+        usage();
+    await generateReleaseBody({
+        templatePath,
+        outPath,
+        currentTag: arg('--current-tag'),
+        previousTag: arg('--previous-tag'),
+        repo: arg('--repo'),
+    });
+    console.log(resolve(process.cwd(), outPath));
+}
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+    main().catch((error) => {
+        console.error(error instanceof Error ? error.message : String(error));
+        process.exit(1);
+    });
+}
+//# sourceMappingURL=generate-release-body.js.map

package/dist/scripts/generate-release-body.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-release-body.js","sourceRoot":"","sources":["../../src/scripts/generate-release-body.ts"],"names":[],"mappings":"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"}

package/dist/scripts/notify-fallback-watcher.js

@@ -16,6 +16,8 @@ import { isSessionStale, isSessionStateAuthoritativeForCwd, readSessionState } f
 import { DEFAULT_SUBAGENT_ACTIVE_WINDOW_MS, readSubagentSessionSummary, } from '../subagents/tracker.js';
 import { listNotifyCanonicalActiveTeams } from './notify-hook/active-team.js';
 import { sameFilePath } from '../utils/paths.js';
+import { validateSessionId } from '../mcp/state-paths.js';
+import { TEAM_NAME_SAFE_PATTERN } from '../team/contracts.js';
 function argValue(name, fallback = '') {
     const idx = process.argv.indexOf(name);
     if (idx < 0 || idx + 1 >= process.argv.length)
@@ -29,6 +31,21 @@ function asNumber(value, fallback) {
 function safeString(v) {
     return typeof v === 'string' ? v : '';
 }
+function normalizeValidSessionId(value) {
+    const trimmed = safeString(value).trim();
+    if (!trimmed)
+        return '';
+    try {
+        return validateSessionId(trimmed) ?? '';
+    }
+    catch {
+        return '';
+    }
+}
+function normalizeValidTeamName(value) {
+    const trimmed = safeString(value).trim();
+    return TEAM_NAME_SAFE_PATTERN.test(trimmed) ? trimmed : '';
+}
 function parsePositivePid(value) {
     const pid = Math.trunc(asNumber(value, 0));
     return pid > 0 ? pid : null;
@@ -366,8 +383,8 @@ async function resolveActiveModeState(mode) {
     const session = await readSessionState(cwd);
     if (session?.session_id) {
         if (isSessionStateAuthoritativeForCwd(session, cwd)) {
-            currentSessionId = safeString(session.session_id).trim();
-            currentSessionIsLive = !isSessionStale(session);
+            currentSessionId = normalizeValidSessionId(session.session_id);
+            currentSessionIsLive = currentSessionId !== '' && !isSessionStale(session);
         }
         if (currentSessionId && currentSessionIsLive) {
             candidateDirs.push(join(stateDir, 'sessions', currentSessionId));
@@ -431,8 +448,8 @@ async function resolveActiveTeamState() {
     let currentSessionIsLive = false;
     const session = await readSessionState(cwd);
     if (session?.session_id) {
-        currentSessionId = safeString(session.session_id).trim();
-        currentSessionIsLive = !isSessionStale(session);
+        currentSessionId = normalizeValidSessionId(session.session_id);
+        currentSessionIsLive = currentSessionId !== '' && !isSessionStale(session);
         if (currentSessionId && currentSessionIsLive) {
             candidateDirs.push(join(stateDir, 'sessions', currentSessionId));
         }
@@ -451,7 +468,7 @@ async function resolveActiveTeamState() {
             .catch(() => null);
         if (!parsed || typeof parsed !== 'object' || parsed.active !== true)
             continue;
-        const teamName = safeString(parsed.team_name).trim();
+        const teamName = normalizeValidTeamName(parsed.team_name);
         if (!teamName)
             continue;
         const teamConfigDir = join(stateDir, 'team', teamName);
@@ -493,7 +510,10 @@ async function resolveActiveTeamState() {
     }
     const canonicalFallbackTeams = await listNotifyCanonicalActiveTeams(cwd, currentSessionId).catch(() => []);
     for (const team of canonicalFallbackTeams) {
-        const teamConfigDir = join(stateDir, 'team', team.teamName);
+        const teamName = normalizeValidTeamName(team.teamName);
+        if (!teamName)
+            continue;
+        const teamConfigDir = join(stateDir, 'team', teamName);
         const manifestPath = join(teamConfigDir, 'manifest.v2.json');
         const configPath = join(teamConfigDir, 'config.json');
         const teamConfigPath = existsSync(manifestPath) ? manifestPath : configPath;
@@ -518,10 +538,10 @@ async function resolveActiveTeamState() {
             path: team.path,
             state: {
                 active: true,
-                team_name: team.teamName,
+                team_name: teamName,
                 current_phase: team.phase,
             },
-            team_name: team.teamName,
+            team_name: teamName,
             pane_count: paneStatus.paneCount,
         };
     }
@@ -596,9 +616,11 @@ async function readRalphSteerLock(path) {
         return null;
     }
 }
+const RALPH_STEER_LOCK_MAX_RETRIES = 5;
 async function withRalphSteerLock(task) {
     await mkdir(dirname(ralphSteerLockPath), { recursive: true }).catch(() => { });
-    while (true) {
+    let acquired = false;
+    for (let attempt = 0; attempt < RALPH_STEER_LOCK_MAX_RETRIES; attempt++) {
         let handle;
         try {
             handle = await open(ralphSteerLockPath, 'wx');
@@ -607,6 +629,7 @@ async function withRalphSteerLock(task) {
                 acquired_at: new Date().toISOString(),
             };
             await handle.writeFile(JSON.stringify(payload, null, 2));
+            acquired = true;
             break;
         }
         catch (error) {
@@ -628,6 +651,10 @@ async function withRalphSteerLock(task) {
             await handle?.close().catch(() => { });
         }
     }
+    if (!acquired) {
+        lastRalphContinueSteer.last_reason = 'global_lock_exhausted';
+        return null;
+    }
     try {
         return await task();
     }
@@ -672,18 +699,18 @@ async function readRalphProgressGate(activeRalphState, now) {
     }
     return { allow: true, reason: 'progress_stale', progress_at: progressAt, subagent_session_id: subagentSessionId };
 }
-function shouldSkipRalphContinue(now, candidateIso, startupIso) {
+function shouldSkipRalphContinue(now, candidateIso) {
     const sharedMs = parseIsoMillis(candidateIso);
     const localMs = parseIsoMillis(lastRalphContinueSteer.last_sent_at);
-    const startupAnchorIso = lastRalphContinueSteer.cooldown_anchor_at || startupIso;
+    const startupAnchorIso = lastRalphContinueSteer.cooldown_anchor_at;
     const startupAnchorMs = parseIsoMillis(startupAnchorIso);
-    const startupCooldown = sharedMs === null && localMs === null;
-    const anchorMs = sharedMs ?? localMs ?? startupAnchorMs ?? startedAt;
+    const startupCooldown = sharedMs === null && localMs === null && startupAnchorMs !== null;
+    const anchorMs = sharedMs ?? localMs ?? startupAnchorMs ?? 0;
     const anchorIso = sharedMs !== null
         ? candidateIso
         : (localMs !== null ? lastRalphContinueSteer.last_sent_at : startupAnchorIso);
     return {
-        skip: now - anchorMs < RALPH_CONTINUE_CADENCE_MS,
+        skip: anchorMs > 0 && now - anchorMs < RALPH_CONTINUE_CADENCE_MS,
         reason: startupCooldown ? 'startup_cooldown' : (sharedMs !== null ? 'global_cooldown' : 'cooldown'),
         anchorMs,
         anchorIso,
@@ -821,7 +848,6 @@ async function writePidFileRecord() {
 async function runRalphContinueSteerTick() {
     const now = Date.now();
     const nowIso = new Date(now).toISOString();
-    const startupIso = new Date(startedAt).toISOString();
     const activeRalph = await resolveActiveRalphState();
     const activePaneId = safeString(activeRalph.state?.tmux_pane_id).trim();
     lastRalphContinueSteer = {
@@ -845,12 +871,9 @@ async function runRalphContinueSteerTick() {
         }
         return;
     }
-    if (parseIsoMillis(lastRalphContinueSteer.last_sent_at) === null && parseIsoMillis(lastRalphContinueSteer.cooldown_anchor_at) === null) {
-        lastRalphContinueSteer.cooldown_anchor_at = startupIso;
-    }
     const sharedBeforeLock = await readRalphSteerTimestamp();
     lastRalphContinueSteer.shared_last_sent_at = sharedBeforeLock;
-    const initialCooldown = shouldSkipRalphContinue(now, sharedBeforeLock, startupIso);
+    const initialCooldown = shouldSkipRalphContinue(now, sharedBeforeLock);
     if (initialCooldown.skip) {
         lastRalphContinueSteer.last_reason = initialCooldown.reason;
         if (!sharedBeforeLock && initialCooldown.reason === 'startup_cooldown') {
@@ -861,7 +884,7 @@ async function runRalphContinueSteerTick() {
     const outcome = await withRalphSteerLock(async () => {
         const sharedLastSentAt = await readRalphSteerTimestamp();
         lastRalphContinueSteer.shared_last_sent_at = sharedLastSentAt;
-        const cooldown = shouldSkipRalphContinue(Date.now(), sharedLastSentAt, startupIso);
+        const cooldown = shouldSkipRalphContinue(Date.now(), sharedLastSentAt);
         if (cooldown.skip) {
             lastRalphContinueSteer.last_reason = cooldown.reason;
             if (!sharedLastSentAt && cooldown.reason === 'startup_cooldown') {