scriptoriumadmin/GitNexus
1
0
Fork 0
mirror of https://github.com/abhigyanpatwari/GitNexus.git synced 2026-09-21 00:21:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix(cli): resolve merge conflict markers in analyze.ts (PR #1478)

Browse source 
Remove leftover conflict hunks from main merge; keep commander stats
shape (stats?: boolean), wire noStats: options?.stats === false into
runFullAnalysis and generateAIContextFiles, and retain indexOnly /
skipSkills / skipAgentsMd wiring from main.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Gergo Magyar 2026-05-11 17:11:54 +01:00
parent e142348b2d
commit 2b031f9d35
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gitnexus/src/cli/analyze.ts
View file

@ -117,7 +117,6 @@ export interface AnalyzeOptions {
verbose?: boolean;
/** Skip AGENTS.md and CLAUDE.md gitnexus block updates. */
skipAgentsMd?: boolean;
<<<<<<< fix/no-stats-flag-effective
/**
* Stats inclusion in AGENTS.md and CLAUDE.md.
*
@ -130,14 +129,10 @@ export interface AnalyzeOptions {
* default-on case.
*/
stats?: boolean;
=======
/** Omit volatile symbol/relationship counts from AGENTS.md and CLAUDE.md. */
noStats?: boolean;
/** Skip installing standard GitNexus skill files to .claude/skills/gitnexus/. */
skipSkills?: boolean;
/** Pure index mode: skip all file injection (AGENTS.md, CLAUDE.md, skills). */
indexOnly?: boolean;
>>>>>>> main
/** Index the folder even when no .git directory is present. */
skipGit?: boolean;
/**
@ -462,19 +457,14 @@ export const analyzeCommand = async (inputPath?: string, options?: AnalyzeOption
embeddingsNodeLimit,
dropEmbeddings: options?.dropEmbeddings,
skipGit: options?.skipGit,
<<<<<<< fix/no-stats-flag-effective
skipAgentsMd: options?.skipAgentsMd,
skipAgentsMd,
skipSkills,
// commander.js `.option('--no-stats', …)` registers the flag as
// `options.stats` (boolean, default true; `false` when the user
// passed --no-stats). Reading `options?.noStats` here returns
// undefined every time, so the flag was a no-op on the markdown
// rewrite path before this fix. See #1477.
noStats: options?.stats === false,
=======
skipAgentsMd,
skipSkills,
noStats: options?.noStats,
>>>>>>> main
registryName: options?.name,
// Registry-collision bypass — its own CLI flag, intentionally NOT
// overloading --force. A user who hits the collision guard should
@ -562,13 +552,13 @@ export const analyzeCommand = async (inputPath?: string, options?: AnalyzeOption
processes: s.processes,
},
skillResult.skills,
<<<<<<< fix/no-stats-flag-effective
// See note above (#1477): commander stores --no-stats as
// `options.stats === false`, not as `options.noStats`.
{ skipAgentsMd: options?.skipAgentsMd, noStats: options?.stats === false },
=======
{ skipAgentsMd, skipSkills, noStats: options?.noStats },
>>>>>>> main
{
skipAgentsMd,
skipSkills,
// See note above (#1477): commander stores --no-stats as
// `options.stats === false`, not as `options.noStats`.
noStats: options?.stats === false,
},
);
}
} catch {